before pull from home
after merg conflicts in MyZoo.v11.suo
fun with git, the home tries