alice's change
alice's change
Some random text
a minor change
a minor change2
a conflicting change, that's been fixed-up
bob's change