Fixing merge failure