corrected bad Annex60 merge