Fix post-rebase merge issues.