testing merging and rebasing