Removes overlooked conflict markers