Removed some merge marks that had been overlooked.
Working to get peacock-2 working again after merges. Not there yet.