bob: edited a line
bob: merged alice's changes