some test for merge and rebase