Removing conflict headers