U3.W8: Dealing with Conflict