test merging with rebasing
testing merge with rebasing