Resolve all conflicts.