Address merge and rebase issues.