update merge conflict for header subhead copy