removed conflict headers