Added content to readme
Added content to file1
Added content to file2
Again added to file1
once Again added to file1
Merge branch 'newb1'
edited again
edited again again
conflict resolved
Merge branch 'master' of https://github.com/paridhi17/paridhi_repo