recovering from a version control mistake...