fixed merge conflict #963