fixed master rebase issues