fix merge conflict #810