Fix merge issues with main repo.