test: add file1
test: edited file1 under branch jim/test1
test: Added file3 to branch test3
Please enter the commit message for your changes. Lines starting
Merge branch 'jim/test1' into jim/test2

Conflicts:
	file1