Fixed merge bug