how should a conflict be resolved