Fixing Merge conflicts