Merge conflict resolution

Fixing merge conflicts...