Changed the Eclipse formater to use the Java convention
fix merge conflicts