Remove uncaught weird <<< HEAD stuff