rebasing.. confused