fix merge conflict in set