tweaks Merge vs. Rebase