Removed <<< HEAD === >>> lines