#dealing with conflict