Fixing version control one more time