getting rid of conflict headers