Actually fix merge conflicts.