remove conflict lines in the merging of UF-115

Sorry, thought I had removed the conflict lines.