One more merge fix
Final fix for merge failure