Fixing merge

Fixing merge