a by user 2
b by user 2
conflict resolved by user 2