Removed some 'diff' marks that somehow made it into the repo.