Issue #128 Preserve Merges for rebase