removing conflict markers