fixed conflict in merge