config/** merge=ours