Fix ugly merge conflicts