Resolve trivial conflicts.