fix merge conflict #870