Fixing merge issue