Merge conflict
Fixing the merge conflict