Remove old <<<HEAD from a previous rebase