Fixing merge conflicts

Conflicts fixed