removed extra <<<HEAD