getting updated file file1.txt
Merge branch 'branch1' of https://github.com/rajeshwerkushwaha/test into branch1
new changes to test conflict
new fetched content