recommit, trying to figure why random <<<HEAD and other code inserted into file