remove conflicts when merging