tweaks to fix merge issues