config.h merge=ours