What are the differences between merging and rebasing?