modified in branch user1
modified by user1
added something one old version
reverted back
merged the conflicts