resolved rebase issues?