Symbol: resolve_conflict