remove conflict headers