Deal with conflict