fixed .classpath
fix merge conflicts? :S