adding .classpath and removing conflict files