remove conflict markers