fix rebasing problems