remove stray merge marks