Resolve of conflicts.