HEAD and master and the lines <<< and ==== must be removed.