Fixed rebase issues.
3 files changed