Fix merge artifacts in build-header