Really fix merge.