fix merge conflict in previous commit