fixing version control bugs