removed .classpath
merge