Fixing Merge conflict