attempting to fix merge issue