fixed merge bug