sprint-53 resolved issue SAT-1309
resolving conflicts
Merge branch 'master' of github.com:Cis-Madhusudhan/satudunia