fixed mungled markup from earlier merge on atlas and various make steps