removing version conflict headers that ended up in some files