Actually fix merge.