2.21 Conflict Resolution (Office 2005)