Changed default behavior from merge to rebase