remove stray line from old merge