fix for merge issue