move this to a safer spot

fixes #12
also remove merge conflict resolution code

darkworldspawn.asm

@@ -51,11 +51,7 @@ SetDeathWorldChecked:
 	+
 	LDA $7EF3C5 : CMP.b #$03 : !BGE .done; thing we originally did - skip if agahnim 1 is dead
 	
-;<<<<<<< crystalsgoalganonrespawn
 	LDA $1B : BEQ + : LDA $A0 : BNE + : LDA GanonPyramidRespawn : BEQ + ; check if we died in ganon's room and pyramid respawn is enabled
-;=======
-;	LDA $1B : BEQ + : LDA $A0 : BNE + ; check if we died in ganon's room
-;>>>>>>> master
 		LDA !FORCE_PYRAMID : ORA.b #$08 : STA !FORCE_PYRAMID ; set pyramid flag
 		BRL DarkWorldFlagSet_pyramid
 	+