removing .classpath
resolve conflicts