fix 2 header old conflicts