merge history