Revert accidental changes to other files

Author: nikkiwritescode

_maps/Rayman/rayman.frb

@@ -1,11 +1,5 @@
-<<<<<<< HEAD:_maps/SuperFamicom/superfamicom.yaml
 name:
   en: Super Famicom
-=======
----
-name:
-  en: Famicom
->>>>>>> 9d02bd87 (Fixed description formatting and added changelog):_maps/Famicom/famicom.yaml
 desc:
   en: A familiar logo becomes a wild goose chase for the bank!
 ruleSet: Standard
@@ -15,30 +9,19 @@ targetAmount: 25000
 baseSalary: 300
 salaryIncrement: 200
 maxDiceRoll: 8
-<<<<<<< HEAD:_maps/SuperFamicom/superfamicom.yaml
 frbFiles:
  - superfamicom0
  - superfamicom1
  - superfamicom2
  - superfamicom3
 background: bg006fixed
 mapIcon: superfamicom
-=======
-frbFiles: 
- - famicom0
- - famicom1
- - famicom2
- - famicom3
-background: bg006fixed
-mapIcon: Famicomicon
->>>>>>> 9d02bd87 (Fixed description formatting and added changelog):_maps/Famicom/famicom.yaml
 tourMode:
   bankruptcyLimit: 1
   opponent1: Mario
   opponent2: Bowser
   opponent3: DonkeyKong
   clearRank: 2
-<<<<<<< HEAD:_maps/SuperFamicom/superfamicom.yaml
 music:
   download:
     - https://nikkums.io/cswt/BGM/SuperFamicom.music.zip
@@ -51,19 +34,6 @@ music:
   auction: SuperFamicomStock.79
   ventureCards: SuperFamicomVenture.77
   win: SuperFamicomWin.75
-=======
-music: 
-  download: https://drive.google.com/uc?export=download&id=1dyAGe8faJ5EDThWuL1r8pVHA-h15yoZU&confirm=1
-  map: FamicomBoard.72
-  targetMet: FamicomTargetMet.72
-  promotionMario: FamicomPromotion.80
-  promotionDragonQuest: FamicomPromotion.80
-  promotionMii: FamicomPromotion.80
-  stock: FamicomAuction.79
-  auction: FamicomStock.79 
-  ventureCards: FamicomVenture.77
-  win: FamicomWin.75
->>>>>>> 9d02bd87 (Fixed description formatting and added changelog):_maps/Famicom/famicom.yaml
 changelog:
   - version: 1
     added:
@@ -200,7 +170,3 @@ ventureCards:
   - 1  # 126 Revaluation venture! Roll the die and expand your shops by 2% for each number.
   - 0  # 127 Special arcade adventure! You're invited to play Round the Blocks and Memory Block!
   - 0  # 128 Special bonus! You receive 55 times the number of shops you own in gold coins from the bank!
-<<<<<<< HEAD:_maps/SuperFamicom/superfamicom.yaml
-=======
-...
->>>>>>> 9d02bd87 (Fixed description formatting and added changelog):_maps/Famicom/famicom.yaml