Remove <<<< unmerged from code.