Really fix merge conflicts