Add merge history and support siblings on history compression