resolving rebase issues