removed conflict
Merge branch 'production' of https://github.com/ShaastraWebops/frontend into production