The process of assigning, correcting, and closing detected conflicts between model elements or disciplines.