trying to fix merge