Fixing a conflict