done: merging two repositories; commit history retained