got rid of <<<<<<HEAD