actually fix merge issues