Resolved conflict in .classpath