removed conflict markers