Misc changes
Committing the merge & conflict resolve