more version control problems
fixing git