merge bug removed