Merge compilation fix