Remove files added from strange EGit merge