trying to fix merge problems