Merging and Rebasing Practice