Fixed merge bug.