trying to fix merge issues