add fix and rebase