fixed a conflict in merge