Remove merge and add rebase and we agree :)

Oh and maybe cherry-pick