move history merging into a method of its own
1.0.4