fixed merge stuffs