merge bug fixed