Fix Merge Fallout