Hi File will commited
Changes in file
Merge branch 'master' of https://github.com/nitin-kalra/git_test into new_branch2
Added a file to check conflicts
Made a change to cause conflicts
Changes in bi