Added yet another change
Merge resolution