Revert "Adding changes in conflictBranch"

This reverts commit e76708d8ac847b5566703ee56167cc9bdfe5a8c3.
Fixing meerge
Merge branch 'conflictBranch' of https://github.com/vaibhavgupta007/project into conflictBranch