yarn-error.log

Arguments: 
  C:\Program Files\nodejs\node.exe C:\Program Files (x86)\Yarn\bin\yarn.js

PATH: 
  C:\Python27\;C:\Python27\Scripts;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\nodejs\;C:\ProgramData\chocolatey\bin;C:\Program Files\Git\cmd;C:\Program Files (x86)\Yarn\bin\;C:\Users\mathe\AppData\Local\Microsoft\WindowsApps;;C:\Users\mathe\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\mathe\AppData\Roaming\npm;C:\Users\mathe\AppData\Local\Yarn\bin

Yarn version: 
  1.22.4

Node version: 
  12.15.0

Platform: 
  win32 x64

Trace: 
  SyntaxError: C:\Users\mathe\OneDrive\Área de Trabalho\SiteEaglesConsultoria\package.json: Unexpected token < in JSON at position 97
      at JSON.parse (<anonymous>)
      at C:\Program Files (x86)\Yarn\lib\cli.js:1625:59
      at Generator.next (<anonymous>)
      at step (C:\Program Files (x86)\Yarn\lib\cli.js:310:30)
      at C:\Program Files (x86)\Yarn\lib\cli.js:321:13

npm manifest: 
  {
    "name": "paercelworkframe",
    "version": "1.0.0",
    "description": "",
    "main": "index.js",
  <<<<<<< HEAD
    "scripts": {
      "dev": "parcel public/index.html --out-dir development -p 3000 ",
      "build": "parcel build public/index.html --out-dir dist --public-url ./"
    },
  =======
    
  "scripts": {
    "dev": "parcel public/index.html --out-dir development -p 3000 ",
    "build": "parcel build public/index.html --out-dir build --public-url ./build"
  },
  >>>>>>> newpp
    "keywords": [],
    "author": "",
    "license": "ISC",
    "devDependencies": {
      "@babel/core": "^7.9.0",
      "@babel/plugin-transform-runtime": "^7.9.0",
      "@babel/runtime-corejs2": "^7.9.2",
      "parcel-bundler": "^1.12.4",
      "posthtml-img-autosize": "^0.1.5",
      "posthtml-modules": "^0.6.0",
      "sass": "^1.26.9"
    },
    "dependencies": {
      "@glidejs/glide": "^3.4.1",
      "@splidejs/splide": "^2.4.9",
      "animate.css": "^4.1.0",
      "gsap": "^3.4.0",
      "rellax": "^1.12.1",
      "swiper": "^6.0.0",
      "wow.js": "^1.2.2"
    }
  }

yarn manifest: 
  No manifest

Lockfile: 
  No lockfile