Fix ugly merge