merge bug solved