Fix merge conflicts that made into the repo.