Fixing merge conflict
Fixing merge conflict