backup before adding test project to repo
merge fix
merge fix