Fixing merge conflicts
Fixing merge conflicts

hashedin/squealy,hemny-singh/squealy,dakshgautam/squealy,hashedin/squealy,swapnil95/squealy,dakshgautam/squealy,swapnil95/squealy,swapnil95/squealy,devashishsharma2302/squealy,hemny-singh/squealy,devashishsharma2302/squealy,devashishsharma2302/squealy,dakshgautam/squealy,hashedin/squealy,hemny-singh/squealy