fix: merge conflicts

README.md

@@ -33,6 +33,10 @@ import { convert, convertMultiple } from 'npm-to-yarn'
 convert('npm install squirrelly', 'yarn')
 // yarn add squirrelly
 
+// npx conversions
+convert('npx create-next-app', 'yarn')
+// yarn dlx create-next-app
+
 // one to many conversions
 convertMultiple("npm i next", ["pnpm", "bun"])
 // ["pnpm add next", "bun add next"]
@@ -50,10 +54,6 @@ convertMultiple(["bun add rollup", "npm i express"], ["yarn", "pnpm"])
 ]
 */
 
-// npx conversions
-
-convert('npx create-next-app', 'yarn')
-// yarn dlx create-next-app
 ```
 
 `npm-to-yarn` exposes a UMD build, so you can also install it with a CDN (it exposes global variable `n2y`)

src/index.ts

@@ -11,9 +11,6 @@ type Command = 'npm' | 'yarn' | 'pnpm' | 'bun'
  */
 
 export function convert (str: string, to: 'npm' | 'yarn' | 'pnpm' | 'bun'): string {
-  if (to === 'npm') {
-
-export default function convert (str: string, to: 'npm' | 'yarn' | 'pnpm' | 'bun'): string {
   if (
     str.includes('npx') ||
     str.includes('yarn dlx') ||

test/index.spec.ts

@@ -541,6 +541,9 @@ describe("Multiple Convert Tests", () => {
   describe("Many to Many", () => {
     it.each(manyToManyTests)('%s', (test) => {
       expect(convertMultiple(test.command, test.managers)).toEqual(test.result)
+    })
+  })
+})
 
 describe('to yarn dlx tests', () => {
   const tests: [npm: string, yarn: string][] = [