remove conflicts