repo re init
rebase and merge