Fixed merge failure

Please merge