3.3 Conflict resolutions