first commit
Merge branch 'master' of https://github.com/dipak1296/testGitRepo1
test2.txt
check

check
Merge branch 'master' of https://github.com/dipak1296/testGitRepo1
COnflict
Update test2.txt
conflict
for branch golu