Actually fix merge conflicts