Fixing merge compilation issues