1package-lock.json merge=ours -diff 2pnpm-lock.yaml merge=ours -diff 3yarn.lock merge=ours -diff 4 5*.md text eol=lf 6*.mdx text eol=lf 7*.markdown text eol=lf