Added --preserve-merges when rebasing