modify merge bug