conflict headers removed from comment