fix merge conflict #845