Merging histories

Merging updates from two locations