Test conflict resolution