remove .classpath from git
confused and trying to merge changes