add adljaljdfa in branch[1] by user2
fix conflict in file1 in branch[1]