dist/* merge=ours