undoing merge of distributed changes