Fixed '<<<<HEAD' insert

What setting allows git to insert these server-breaking lines?