fixing merge conflict #1917