Resolving conflicts - Couple resolving onflicts.