Super-destroy merge conflicts!

Hopefully.