Sometimes your version control creates its own code
Here’s Flickr’s site today showing some revision conflict code

addthis_url = ‘http%3A%2F%2Fblog.joopp.com%2F2008%2F12%2F15%2Fflickr-version-control%2F’;
addthis_title = ‘Flickr+version+control’;
addthis_pub = ‘joopp’;