data latest commit
conflict resolve
Merge branch 'master' of https://github.com/getpradeep9/repo18aug2013
m
conflict resolved