remove merge bug