added feature rebasing