Deleted <<<<<< HEAD text