actually fix merge problems