Deconflict: Removal of <<<<<< HEAD