Annotating history witht he most recent merge