fixed weird merge conflict on .classpath file