fixed one merge bug