Remove trivial conflicts