remove left out line <<<Head after conflict