Merge conflicts

Fixing merge conflicts