Removed "<<<<<< HEAD "

What is this?