my account changes code
resolving conflicts
changes
Merge branch 'master' of github.com:adlakhavaibhav/HealthKartWeb into sachit-myAccount
Merge branch 'master' into sachit-myAccount