More work trying to merge the branches.