master rebase complete