adding fixes to merge

game/script/11.school-assignment-and-route-lock.rpy

@@ -1252,6 +1252,13 @@ label chapter_11:
 
        Nas "What did I ever do to her…?"
 
+       if wingStory:
+         jump wingA
+       else:
+         jump wingB
+
+       label wingA:
+
        A "I-er…"
 
        Nas "What, do you know?"

game/script/4.anon-needs-help-during-music-period.rpy

@@ -67,7 +67,7 @@ label chapter_4:
     hide naser with moveoutleft
     hide naomi with moveoutleft
     "I turn away from the two and leave them behind in the cafeteria."
-    scene bandroom
+    scene auditorium
     "Now that i’m in front of the auditorium when it isn’t crowded for once, I can get a decent look around the foyer."
     "The walls are as vine-covered as anywhere else in the building, but the ones here have small magenta flowers blooming on them here and there."
     "I suppose there’s different kinds of vines, wouldn’t make much sense otherwise. Never really thought about it until now."

game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy

@@ -1465,7 +1465,7 @@ label chapter_5:
     "Even if he’s constantly checked out."
     "And smells of burnt skunk."
     "The fuck is he on, anyway?!"
-    scene bandroom
+    scene auditorium
     show anon neutral at acenter
     show reed neutral at sright
     Re "It’s carfe, bro…"
@@ -1755,6 +1755,9 @@ label chapter_5:
             jump interrupt4c
 
     label quiet4c:
+
+    $ wingStory = True
+
     F "And the worst part is he can’t even hate me."
 
     show fang sad

game/script/6.anon-helps-fang-find-a-venue-for-band.rpy

@@ -52,7 +52,6 @@ label chapter_6:
     "Still feeling refreshed, I grab my jacket and start making my way across town to Fang’s house."
     scene black with fade
     "..."
-    scene home fang day with fade
     play music "audio/OST/Skinrow Soul.ogg" fadein 1.0
     show anon neutral at aleft
     "Passing through the snobby part of town to catch a bus, my thoughts begin intruding on me."