Removed "<<<< HEAD" thingy from .classpath