This feels awkward? Was it intended to be "Playing nicely with version control"?