Commenting the new stuff
Fixing merge conflict