fixed merge failure