Fixed merge failure