Removing conflict markers