Remove the git diff text (<<<<<<< HEAD ...) in some Java classes\!