The members of the IT department have spent two days debating the best approach to roll out the new software update. After allowing each member of the department to voice his or her​ case, a decision was made that all the members could support. What type of conflict has the IT department​ experienced?