Pooja - fixing merge conflict issues
Pooja/Shruthi - refactoring