remove remaining merge conflict

I think this part should have remained?

Pro-Tip: use emacs smerge-mode :)