main merge bug fixed