resolve merge stuffs