Fixed rebase issues.