remove <<< HEAD etc.