Add line in test in branch test1 by user1
add a line at branch master by user1
conflict fixed
modify readme at branch test1 by user1
Merge branch 'test1'
add something at branch temp by user1