Version control madness