fixing merge issues

Created by  Ed Langley  on September 14, 2018
MDLZDQL6E4N5RLKKKRYNHSFONGR6RWGGYJ7JN4QVOAKJOAKNPOMQC
Change contents