A repo for our users, practice resolving conflicts and checking in old/obsolete repos