herokuにデプロイする際にエラーが発生していて原因がわかりません。

前提・実現したいこと

ここに質問の内容を詳しく書いてください。

Vue.js、Vuexでトレロ風アプリを作っています。
herokuにデプロイする際にエラーが発生しています。

試したことに記載しているサイトを参考にしながら行ったのですが、解決できません。
ご教授お願い致します。

発生している問題・エラーメッセージ

ターミナルでgit push heroku masterを実行すると以下のエラーが発生します。
error: failed to push some refs to 'https://git.heroku.com/task0202.git'

該当のソースコード

heroku logs --tail --app <<アプリケーション名>>を実行

Enumerating objects: 134, done.
Counting objects: 100% (134/134), done.
Delta compression using up to 8 threads
Compressing objects: 100% (117/117), done.
Writing objects: 100% (134/134), 245.72 KiB | 7.93 MiB/s, done.
Total 134 (delta 52), reused 0 (delta 0)
remote: Compressing source files... done.
remote: Building source:
remote: 
remote: -----> Node.js app detected
remote: 
remote: -----> Build failed
remote:  !     Two different lockfiles found: package-lock.json and yarn.lock
remote: 
remote:        Both npm and yarn have created lockfiles for this application,
remote:        but only one can be used to install dependencies. Installing
remote:        dependencies using the wrong package manager can result in missing
remote:        packages or subtle bugs in production.
remote: 
remote:        - To use npm to install your application's dependencies please delete
remote:          the yarn.lock file.
remote: 
remote:          $ git rm yarn.lock
remote: 
remote:        - To use yarn to install your application's dependences please delete
remote:          the package-lock.json file.
remote: 
remote:          $ git rm package-lock.json
remote:     
remote:        https://help.heroku.com/0KU2EM53
remote: 
remote:  !     Push rejected, failed to compile Node.js app.
remote: 
remote:  !     Push failed
remote: !
remote:  ! ## Warning - The same version of this code has already been built: 3f71b4980da99e38ad0ed4be086a3ef6c97289ad
remote:  !
remote:  ! We have detected that you have triggered a build from source code with version 3f71b4980da99e38ad0ed4be086a3ef6c97289ad
remote:  ! at least twice. One common cause of this behavior is attempting to deploy code from a different branch.
remote:  !
remote:  ! If you are developing on a branch and deploying via git you must run:
remote:  !
remote:  !     git push heroku <branchname>:main
remote:  !
remote:  ! This article goes into details on the behavior:
remote:  !   https://devcenter.heroku.com/articles/duplicate-build-version
remote: 
remote: Verifying deploy...
remote: 
remote: !	Push rejected to task0202.
remote: 
To https://git.heroku.com/task0202.git
 ! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to 'https://git.heroku.com/task0202.git'