fixing merge conflict #805