Removed accidentally added conflicted lines

I believe this is not intended?
Please fix 0.8.0 and release 0.8.1.
Thanks!