Rebase and add commit messages