conflict (resolved)