merge bug correction