Fixing merge history with a bandaid