Merge Conflict

.metadata/.log

...sources/.projects/project1/org.eclipse.jdt.core/state.dat

...ources/.projects/project10/org.eclipse.jdt.core/state.dat

...sources/.projects/project2/org.eclipse.jdt.core/state.dat

...sources/.projects/project3/org.eclipse.jdt.core/state.dat

...sources/.projects/project4/org.eclipse.jdt.core/state.dat

...sources/.projects/project5/org.eclipse.jdt.core/state.dat

...sources/.projects/project6/org.eclipse.jdt.core/state.dat

...sources/.projects/project7/org.eclipse.jdt.core/state.dat

...sources/.projects/project8/org.eclipse.jdt.core/state.dat

...e.resources/.projects/temp/org.eclipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.root/.markers

.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi

.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt