Remove weird <<< HEAD stuff