Add file1
add a line in file1 in branch[1] by user1
add adljaljdfa in branch[1] by user2
fix conflict in file1 in branch[1]
Merge branch '1'