code
resolved merge conflicts
code
code refactor done
code
code
code
resolved merge conflicts
code fix all done
code
Merge branch 'rimal-bug' into rimal
error handled for parser
fix to check exception
location api synced with web
Merge branch 'master' into shrey-refactor
Merge branch 'master' into rimal
code
code done
code
merging with master