Merge conflicts

Adding changes for merge conflicts