Fixing merge conflicts
Fixing merge conflicts