user2 change file2
user2 solve a conflict
user2 process a conflict