Remove the '<<<<<<< HEAD' line