Remove merge failure markings