version control should work smoother