Index: trunk/asma/Docs/STIL.txt
===================================================================
--- trunk/asma/Docs/STIL.txt	(revision 1672)
+++ trunk/asma/Docs/STIL.txt	(revision 1673)
@@ -1416,7 +1416,4 @@
  ARTIST: Shinobu Ogawa
 
-<<<<<<< .mine
-/Composers/Fragmare/Journey_to_Sillius_Stage_2.sap
-=======
 /Composers/Fragmare/Haunted_Castle_Cross_Your.sap
   TITLE: Cross Your Heart [from the Arcade game Castlevania: Haunted Castle (Devil's Castle Dracula)]
@@ -1424,5 +1421,4 @@
 
 /Composers/Fragmare/Journey_to_Sillius_Undergr.sap
->>>>>>> .r1671
   TITLE: Underground Concourse Stage [from the NES game Journey to Silius]
  ARTIST: Naoki Kodaka
@@ -3877,11 +3873,4 @@
          but with second POKEY support (stereo version).
 
-<<<<<<< .mine
-=======
-/Composers/Pesout_Marek/Bol_Effects.sap
-COMMENT: Soundtrack from the part 7 ("Bol Effects) of "Top Secret Megademo"
-         which took first place at Forever 2019 Atari demo compo.
-
->>>>>>> .r1671
 /Composers/Pesout_Marek/Breathe.sap
   TITLE: Breathe [from The Fat of the Land]