Conflict resolution

Information to come