resolve merge failure