Bug/stud 1962

@cahrens please review

@nasthagiri managing version conflict errors while keeping them when we need them may require another context manager or some other mechanism. (see all of the for_version stuff in the new test code)
more than one parent_location?