My new way of dealing with conflict