Merge category conflicts.