fix: yarn lock conflict

Author: alvarosabu

yarn.lock

@@ -8731,15 +8731,9 @@ tailwindcss@^2.2.4:
     tmp "^0.2.1"
 
 tar@^6.0.2, tar@^6.1.0:
-<<<<<<< HEAD
-  version "6.1.0"
-  resolved "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz"
-  integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==
-=======
   version "6.1.5"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.5.tgz#6e25bee1cfda94317aedc3f5d49290ae68361d73"
   integrity sha512-FiK6MQyyaqd5vHuUjbg/NpO8BuEGeSXcmlH7Pt/JkugWS8s0w8nKybWjHDJiwzCAIKZ66uof4ghm4tBADjcqRA==
->>>>>>> origin/main
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"