merge bug fixing