resolve_conflict