merged with whatever was in the repository (take #2)