user2 commit1
user2 resolved conflict