Removed <<<<<<< HEAD tags.