merge bug