fixing merge conflict #939