remove remaining merge conflict

I think this part should have remained?
Merge pull request #2028 from andresailer/patch-2

remove remaining merge conflict