Oh snap that's why we kept erasing the registry file
Don't be afraid to do a git-merge if the repo is clean