Unable to fix spelling, I tried Github desktop merge no success

[Kryptoknife]

• I'm submitting a bug report

• Summary

• When I try to merge I get 2 conflicts, when I open it in notepad++ I get this :

  {
  "chainId": 101,
  <<<<<<< HEAD
  =======
  "address": "6LetM1yRt8zPtyZdsRfdy7EPYPhZhs1ojzDqgPPPv3Wa",
  "symbol": "MONEY",
  "name": "MoneyBlock",
  "decimals": 0,
  "logoURI": "https://raw.githubusercontent.com/Kryptoknife/crypto/main/logo.png",
  "tags": [
  "utility-token"
  ],
  "extensions": { 👎
  "discord": "https://discord.gg/3YcXhmc3eX",
  "twitter": "https://twitter.com/MoneyblockNFT",
  "instagram": "https://instagram.com/MoneyblockNFT",
  "website": "https://moneyblock.org"
  },
  {

main
"address": "6nyiZ7uHKPHRhZa6nw2eBS4njxStM6kmEUr6uLFhJz9Z",
"symbol": "PCS",
"name": "Precious Jewelry",
"decimals": 0,
"logoURI": "https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/6nyiZ7uHKPHRhZa6nw2eBS4njxStM6kmEUr6uLFhJz9Z/pcs_ico.jpg",
"tags": [
"utility-token"
],
"extensions": {
<<<<<<< HEAD
======= 👎
"discord": "https://discord.gg/3YcXhmc3eX",
"twitter": "https://twitter.com/MoneyblockNFT",
"instagram": "https://instagram.com/MoneyblockNFT",
"website": "https://moneyblock.org"
}
main
"website": "https://precious.capital/"
}
},

• I created a new branch called New-token-list
• I tried to fix manually and push it seemed to go well but when I went back to the request it still says duplicate wallet
  Please change lowercase to uppercase, it says duplicate wallet Please change lowercase to uppercase, it says duplicate wallet #29650

https://github.com/solana-labs/token-list/pull/29650/checks?check_run_id=6870588574

Kryptoknife:Solana-Tokens-2 had recent pushes 14 minutes ago

I'm just confused right now :( I just want Moneyblock to be MoneyBlock please 👍