[Fixed] Resolved some conflicts

locations/artem_nush_sex.qsrc

@@ -274,18 +274,14 @@ if $ARGS[0] = 'anushka_3some1_cleanup':
 	'Once you''re all cleaned up, you start dressing before Anushka grabs her purse off the floor where she dropped it. "I have to admit, you surprised me Artem. That sex there was better than I was expecting. Hell, you were better than I was expecting. Who knew you had such a bad boy streak in you?"'
 	'Artem blushes a little at her compliment, but you also notice his chest swell in obvious pride at her words. "Thanks... Uh... I hope everything I said was okay and I didn''t push it too far?"'
 	*nl
-<<<<<<< Updated upstream
-	'You bite your lip half expecting Anushka to go off on him now for admitting it was just an act. But to your surprise she walks over and pats him on the cheek. "You did great, I loved it. But word of advice, next time don''t ruin it at the end. During play time own the attitude, got it?"'
-	'He giggle softly as he nods. "Got it." Then it seems to hit him what else she said. "Next time?"'
-	'She shrug a bit as she starts getting dressed. "Sure if you guys want, I had fun, so why not."'
-=======
-	'You bite your lip, half expecting Anushka to go off on him now for admitting it was just an act, but to your surprise she walks over and pats him on the cheek. "You did great and I loved it. Word of advice, though. Don''t ruin it like that. Own the attitude, okay?"'
+
+	'You bite your lip, half expecting Anushka to go off on him now for admitting it was just an act, but to your surprise, she walks over and pats him on the cheek. "You did great and I loved it. Word of advice, though. Don''t ruin it like that. Own the attitude, okay?"'
 	'He giggles softly as he nods. "Got it." Then it seems to hit him. "Next time?"'
 	'She shrugs as she starts getting dressed. "Sure, if you guys want. I had fun, so why not?"'
->>>>>>> Stashed changes
+
 	*nl
 	'He grins ear from ear, apparently never expecting to hear all the praise he''s getting. "Yeah, sure." Then he glances at you. "I mean if <<$pcs_nickname>> is okay with it."'
-	'You smile at him. "We can talk about it later." You had fun, but do you wantyour boyfriend fucking one of your best friends to be a regular thing?'
+	'You smile at him. "We can talk about it later." You had fun, but do you want your boyfriend fucking one of your best friends to be a regular thing?'
 	if grupTipe3 = 1:
 		'Once you''re all dressed, Anushka touches up her makeup using her compact mirror. Once she''s done, she stands up. "Okay, I need to get going. Later nerds."'
 	else

locations/artem_nush_sex_uni.qsrc

@@ -770,26 +770,25 @@ if $ARGS[0] = 'anushka_3some2_dom_strapon_anal':
 					gs 'arousal', 'clit_finger', 2, 'masturbate'
 					gs 'arousal', 'end'
 					gs 'stat'
-						act 'Clean up':
+					act 'Clean up':
+						*clr & cla
+						minut += 5
+						'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
+						'Anushka grabs some tissues and starts cleaning up. "That was amazing, though I think my ass is going to be sore tomorrow."'
+						'Artem snorts. "Serves you right for all the years you bullied me."'
+						'You laugh. "You''re becoming a real submissive butt slut for this nerd, aren''t you?"'
+						'Anushka rolls her eyes and shakes her head. "Whatever. I just like getting fucked." Once she finishes cleaning herself, she starts getting dressed, as do you and Artem. Anushka then grabs her purse and compact and starts to touch up her makeup.'
+						if grupTipe3 = 1:
+							'Once you''re all dressed and Anushka is done touching up her makeup, she gets up. ""Okay, I need to get going, but I guess I''ll see you at the Coffee Hole for your nerd night," she says to Artem before she turns to you. "I''ll see you around, <<$pcs_nickname>>. Later nerds."'
+						else
+							'Once you''re all dressed and Anushka is done touching up her makeup, she gets up. ""Okay, I need to get going, but I guess I''ll see you at the Coffee Hole for your nerd night," she says to Artem before she turns to you. "I''ll see you around, <<$pcs_nickname>>. Later losers."'
+						end
+						act 'You need to leave too':
 							*clr & cla
-							minut += 5
-							'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
-							'Anushka grabs some tissues and starts cleaning up. "That was amazing, though I think my ass is going to be sore tomorrow."'
-							'Artem snorts. "Serves you right for all the years you bullied me."'
-							'You laugh. "You''re becoming a real submissive butt slut for this nerd, aren''t you?"'
-							'Anushka rolls her eyes and shakes her head. "Whatever. I just like getting fucked." Once she finishes cleaning herself, she starts getting dressed, as do you and Artem. Anushka then grabs her purse and compact and starts to touch up her makeup.'
-							if grupTipe3 = 1:
-								'Once you''re all dressed and Anushka is done touching up her makeup, she gets up. ""Okay, I need to get going, but I guess I''ll see you at the Coffee Hole for your nerd night," she says to Artem before she turns to you. "I''ll see you around, <<$pcs_nickname>>. Later nerds."'
-							else
-								'Once you''re all dressed and Anushka is done touching up her makeup, she gets up. ""Okay, I need to get going, but I guess I''ll see you at the Coffee Hole for your nerd night," she says to Artem before she turns to you. "I''ll see you around, <<$pcs_nickname>>. Later losers."'
-							end
-							act 'You need to leave too':
-								*clr & cla
-								'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
-								'You smile and kiss him again. "I''m glad you had fun, but I need to get going as well."'
-								'He hugs you. "See you later babe, I can''t wait to do this again." He kisses you again before walking you to the door. As you leave, you think about what just happened. You and your boyfriend justed fucked your best friend. As you head out the door and Artem closes it behind you, you wonder if this was a mistake. You suppose only time will tell...'
-								act 'Leave': gt 'uni_dorm', 'second_floor'
-							end
+							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
+							'You smile and kiss him again. "I''m glad you had fun, but I need to get going as well."'
+							'He hugs you. "See you later babe, I can''t wait to do this again." He kisses you again before walking you to the door. As you leave, you think about what just happened. You and your boyfriend justed fucked your best friend. As you head out the door and Artem closes it behind you, you wonder if this was a mistake. You suppose only time will tell...'
+							act 'Leave': gt 'uni_dorm', 'second_floor'
 						end
 					end
 				end
@@ -820,12 +819,12 @@ if $ARGS[0] = 'artem_nush':
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk1.jpg"></center>'
 	'Anushka sits and leaves room for you between her and Artem, but you motion for her to scoot over next to Artem and you sit next to her, sandwiching her between the two of you. Artem gives you a questioning look, but you just smile and nod at him.'
-	'He grins and leans back in a half reclining position as you engage Anushka in a conversation about her latest sexual partner. You can see the bulge growing in his pants, and Anushka soon does as well. "Guess someone likes my story, huh?" she asks in a bemused tone.'
+	'He grins and leans back in a half-reclining position as you engage Anushka in a conversation about her latest sexual partner. You can see the bulge growing in his pants, and Anushka soon does as well. "Guess someone likes my story, huh?" she asks in a bemused tone.'
 	act 'Tell her to peek':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffe_hole/anushka/walk2.jpg"></center>'
 		'You lean against her, pushing her closer to Artem. "I think someone wants to say hi. Why don''t you take a peek?"'
-		'She looks back at you with a questioning look, but starts to unbutton and unzip his pants to peek inside. "It''s too dark to see anything. Pull his dick out so we can see it," you tell her.'
+		'She looks back at you with a questioning look but starts to unbutton and unzip his pants to peek inside. "It''s too dark to see anything. Pull his dick out so we can see it," you tell her.'
 		act 'Tell her to take it out':
 			*clr & cla
 			gs 'boyStat', 'A2'
@@ -954,7 +953,7 @@ if $ARGS[0] = 'artem_nush_strip':
 									'Once the doors to the tenth floor open, he hugs you. "See you later, babe. I can''t wait to do this again, but maybe next time I can fuck you instead?" He kisses you again before you walk out of the elevator and he pushes the button for his floor. As you walk down to your room, you think about what just happened. Your boyfriend just fucked your best friend while you watched. You wonder if it was a mistake, but suppose that only time will tell...'
 									act 'Go to your dorm floor': gt 'uni_dorm', 'tenth_floor'
 								else
-									'Artem walks you back to the well lit streets, where you smile and kiss him again. "I''m glad you had fun, but I need to get going as well."'
+									'Artem walks you back to the well-lit streets, where you smile and kiss him again. "I''m glad you had fun, but I need to get going as well."'
 									'He hugs you. "See you later, babe. I can''t wait to do this again, though maybe next time I can fuck you instead?" He kisses you again before walking towards the university campus. As you leave, you think about what just happened. Your boyfriend just fucked your best friend while you watched. You wonder if it was a mistake, but suppose that only time will tell...'
 									act 'Leave': gt 'city_island'
 								end

locations/artem_sex.qsrc

@@ -499,12 +499,10 @@ if $ARGS[0] = 'slut_fuck':
 	artemQW['artem_dom'] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/first3.jpg"></center>'
-<<<<<<< Updated upstream
-	'You start stripping before him, giving him a little show as you remove your clothes, reveling in his undivided attention. Once you''re fully naked, he mutters "Lie down on your side, <<$pcs_nickname>>."'
-=======
+
 	'You start stripping before him, giving him a little show as you remove your clothes, revelling in his undivided attention.'
 	'"Lie down on your side," he mutters once you''re naked.'
->>>>>>> Stashed changes
+
 	gs 'arousal', 'flash', 2, 'sub'
 	gs 'stat'
 	act 'Lay on your side':
@@ -790,13 +788,10 @@ if $ARGS[0] = 'anushka_3some_doggy':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some16.jpg"></center>'
 					'"Don''t slow down, baby. Tear that ass up and show her who owns it!" you tell him as you grab hold of her hips to stop her from pulling away, as you go back to licking her pussy.'
 					'You feel his hands reach up and firmly grab her by the hips, one hand reaching up to hold her by the shoulder as he slides his dick nearly entirely out of her before slamming it back in and hammering her balls deep. You can feel her trying to pull away, but he holds her firm. "That''s right bitch, tonight your ass is mine!"'
-<<<<<<< Updated upstream
-					*nl
-					'Her moans start turning into grunts, but he''s not done. "Who''s the pussy assed bitch now!?" When she doesn''t respond, he reaches up and grabs her by the hair and turns her head until she can look back over her shoulder at him, as he looks at her, while fucking her ass. "I asked you a question bitch, and now you''re going to answer it." Then in a firmer voice he says again. "Who''s the pussy assed bitch now!?" You''re a little shocked that you''ve brought this side out of him, but are also feeling a little proud.'
-=======
+
 					'Her moans start turning into grunts, but he''s not done. "Who''s the pussy assed bitch now!?"'
 					'When she doesn''t respond, he reaches up and grabs her by the hair before turning her head until she''s looking back over her shoulder at him. "I asked you a question, bitch! Answer it!" You''re a little shocked that you''ve brought this side out of him, but are also feeling a little proud.'
->>>>>>> Stashed changes
+
 					gs 'arousal', 'cuni_give', 2, 'lesbian', 'dom'
 					gs 'stat'
 					act 'Let this play out':
@@ -806,11 +801,8 @@ if $ARGS[0] = 'anushka_3some_doggy':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some14.jpg"></center>'
 						'You can hear her grunts turning back into moans as well, not to mention her already soaking wet pussy is soaking your face even more, she is getting off this big time. Your thoughts are interrupted as she answers him. "OOOHHH... I... am..." Her reply is breathless.'
 						'You can hear the excitement in his voice, it seems he is really starting to get into this. "You are what?"'
-<<<<<<< Updated upstream
-						'"OH... OH... I''m.... the pussy.... assed bitch." She struggles to get out from the hard fucking Artem is giving her but her ever-increasing soaking pussy tells you she is loving it.'
-=======
 						'"OH... OH... I''m.... the pussy.... assed bitch." She struggles to get out from the hard fucking Artem is giving her, but her ever increasing soaking pussy tells you she''s loving it.'
->>>>>>> Stashed changes
+
 						*nl
 						'"That''s right. I own your ass and I''m going to tear it up because there''s nothing you can do about it!"'
 						'You have to admit that you wern''t expecting him to be this assertive as she grips your leg tightly. "Oh fuck... Oh fuck... Not... So hard." She''s starting to resist, but is still enjoying being used.'
@@ -914,13 +906,9 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 				'He starts to say something, then stops and sighs before nodding in agreement. "You''re right. I should have stood up to her, but I shouldn''t need my girlfriend to defend me. I''m just so used to her and the other gopniks picking on me... That she intimidates me. I''m not sure what I expected from her anyway. She is who she is."'
 				*nl
 				'You give him another hug. "She''s more bark than bite. Plus, you just got to fuck one of your bullies in the ass."'
-<<<<<<< Updated upstream
-				'He nods and smiles at your comment. "Yeah. Yeah, you''re right. I guess I got her back a little; hopefully, it hurt." He blushes at his own words and glances at you. "Do you think it did?"'
-				'You smile at him and give him a reassuring look. "Hell yes, how you were pounding her ass there at the end. I bet her ass will be sore tomorrow too." He glances at you, then laughs, and you laugh with him.'
-=======
 				'He nods and smiles at your comment. "Yeah. Yeah, you''re right! I guess I got her back a little; hopefully it hurt." He blushes at his own words and glances at you. "Do you think it did?"'
 				'You smile at him and give him a reassuring look. "Hell yes, how you were pounding her there at the end. I bet her ass will be sore tomorrow too." He glances at you, then laughs, and you laugh with him.'
->>>>>>> Stashed changes
+
 				'"Thanks, I needed that." He kisses you and thanks you for a great time before walking you to the door. Hoping this didn''t bother him, you head on your way.'
 				act 'Leave': gt 'pod_ezd', 'etaj_1'
 			end
@@ -962,15 +950,10 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 				'Once he finishes, an amused grin appears on her flushed face as she glances over at you. You just shrug and she looks back at him. "Wow, the mouth on him. Where was this Artem earlier? Would you have even done any of that if <<$pcs_nickname>> and I hadn''t encouraged you?" She steps up to him and places a hand on his chest while looking him in the eye.'
 				'"I don''t think so," she says. "I like this new Artem. He''s sexy, but I don''t buy that it''s you." She then walks out, stopping at the door to glance back one last time. "At least not yet," she says with a grin.'
 				*nl
-<<<<<<< Updated upstream
-				'He doesn''t back down from her. "You''re wrong and next time you will know it too."'
-				'She gives a slight snort. "Who says there will be a next time."'
-				'He steps up right to her crowding her until he bumps into her forcing her to take a step back as he says in a firm voice. "I do." Then quickly glances at you, before looking back to her. You don''t know if he was looking from encouragement from you or to check if he crossed a line, either way he seems to believe he is good to go as, he crowds her even more forcing her to take a step back again. "See I finally figured you out, deep down you like guys that bully, dominate, and humiliate you." He keeps crowding her and making her back up more and more until he finally corners her in the corner of his room next to the door.'
-=======
 				'He doesn''t back down from her. "You''re wrong and next time you''ll know it too."'
 				'She snorts. "Who says there will be a next time?"'
 				'He steps up right to her, crowding her and forcing her to take a step back. "I do," he says in a firm voice and quickly glances at you before looking back at Anushka. You don''t know if he was looking from encouragement from you or checking if he crossed a line, but he seems to believe he''s good to go as he crowds her even more. "I finally figured you out. Deep down, you like guys that bully, dominate and humiliate you." He keeps crowding her and making her back up more and more until he finally corners her.'
->>>>>>> Stashed changes
+
 				act 'Just watch':
 					*clr & cla
 					artemQW['nush3some_again'] = 2
@@ -992,15 +975,6 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 						act 'Ask how he feels':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
-<<<<<<< Updated upstream
-							'He walks back over and sits down next to you. You smile at him and kiss him. "I won''t lie, I was impressed by how you handled her, I am proud of you." You say to him and kiss him again. "So, how did that make you feel?"'
-							'He looks thoughtful for a second. "You know what? I feel great, I really do." He pauses as if he''s considering what to say next, you give him time to collect his thoughts. "I don''t know... I just suddenly had enough and I was like hell with this I am going to push back for once." Then he grins. "As I told her what I thought and realized she was backing down from me...from ME!" He shakes his head a bit. "Thats when I had a real surge of confidence, so I pushed back even more. Thats... that''s when it suddenly hit me, she liked it and... I don''t know it is like so many things suddenly clicked in my head and just seemed so much better."'
-							*nl
-							'You give his hand a reassuring squeeze. "I''m glad you had this moment, confidence looks good on you."'
-							'He turns his head and looks at you. "Thanks, I mean it, it was your encouragement that helped me get here, with out you..." He trails off.'
-							'You shake your head. "No while I might have helped get you here a little faster this is who you always were, who I always saw you to be, you would have got here on your own, I am just glad I could help."'
-							'He smiles to you. "Thanks... I still can''t really believe I fucked Nush like a slut and then made her my bitch afterward, forcing her to agree." He sounds elated beyond words, he looks like the weight of the world has lifted off him. Apparently, all the bullying has bothered him more than he said and now it seems to have lifted at least for now.'
-=======
 							'He walks back over and sits next to you. You smile and kiss him. "I won''t lie, I was impressed by how you handled her. How did it make you feel?"'
 							'He looks thoughtful for a second. "You know what? I feel great, I really do." He pauses, as if he''s considering what to say next. "I don''t know... I just suddenly had enough and thought I push back for once. As I told her what I thought and realized she was backing down from me... from ME!" He shakes his head. "That''s when I had a real surge of confidence, so I pushed back even more. That''s... That''s when it suddenly hit me: She liked it and... I don''t know, it''s like so many things suddenly clicked in my head and it just seemed so much better."'
 							*nl
@@ -1008,7 +982,7 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 							'He turns his head and looks at you. "Thanks, but it was your encouragement that helped me get here. Without you..." He trails off.'
 							'You shake your head. "No. While I might have helped get you here a little faster, this is who you always were, who I always saw you to be. You would have gotten here on your own eventually, but I''m just glad I could help."'
 							'He smiles. "Thanks... I still can''t really believe I fucked Nush like a slut and then made her my bitch afterwards, forcing her to agree." He sounds elated beyond words and looks like the weight of the world has lifted off him.'
->>>>>>> Stashed changes
+
 							act 'Ask if he wants to do it again':
 								*clr & cla
 								minut += 10
@@ -1049,13 +1023,8 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 			'She snorts. "Oh, I''ll give it to you that for the last few minutes, you started to actually fuck me like a man, but that was only after <<$pcs_nickname>> and I encouraged you several times." She steps up close to him and taps him on the chest. "Which means you have it in you, but where was that earlier, hmm? The last few minutes don''t make up for the rest."'
 			'His grin fades and he sighs. "Sorry I wasn''t very good..."'
 			*nl
-<<<<<<< Updated upstream
-			'She rolls her eyes and shakes her head. You know she dislikes it when people won''t stand up for themselves. "What... ever... Later losers." She walks out of his room and you hear the front door open and close a few seconds later.'
-			'As she leaves, you can see he still seems happy but says her words bothered him. Just as you''re about to say something, he interrupts you. "My mom should be home soon, and I need to get started on my homework."'
-=======
 			'She rolls her eyes and shakes her head. You know she dislikes it when people won''t stand up for themselves. "What. Ever. Later losers." She walks out of his room and you hear the front door open and close a few seconds later.'
 			'As she leaves, you can see he still seems happy, but tell her words bothered him. Just as you''re about to say something, he interrupts you. "My mom should be home soon and I need to get started on my homework."'
->>>>>>> Stashed changes
 			'You smile and kiss him again. "Don''t listen to her. You were great as always."'
 			'He snorts softly. "Sure... Thanks for standing up for me then."'
 			act 'You need to stand up for yourself':
@@ -1089,11 +1058,7 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 				'You give him a hug, but he doesn''t really return it. "I''m sorry. I should have stood up for you."'
-<<<<<<< Updated upstream
-				'He starts to say something. "No. I''m nearly an adult and I should have stood up to her! I shouldn''t need my girlfriend to defend me, but I''m just so used to her and the other gopniks picking on me, that she intimidates me. She was right; I was pretty meek and passive until the very end when you both encouraged me."'
-=======
 				'"No. I''m nearly an adult and I should have stood up to her! I shouldn''t need my girlfriend to defend me, but I''m just so used to her and the other gopniks picking on me that she intimidates me. She was right; I was pretty meek and passive until the very end when you both encouraged me."'
->>>>>>> Stashed changes
 				*nl
 				'You give him a hug. "She''s more bark than bite. Plus, you just got to fuck one of your bullies in the ass."'
 				'He nods and smiles at your comment. "Yeah. Yeah, you''re right! Not only did I get to fuck her, but I tore her ass up, something I never dreamed would ever happen. Yeah, I think I''m good." He kisses you and thanks you for a great time before walking you to the door. Hoping this didn''t bother him, you head on your way.'
@@ -1155,11 +1120,7 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 			artemQW['nush3some_again'] = 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-<<<<<<< Updated upstream
-			'You don''t want to get in the middle of this. You glance at him but don''t meet his eyes, and his grin fades as he sighs and looks at her. "Sorry I wasn''t very good."'
-=======
 			'You don''t want to get in the middle of this. You glance at him, but don''t meet his eyes, and his grin fades as he sighs and looks at her. "Sorry I wasn''t very good..."'
->>>>>>> Stashed changes
 			'She rolls her eyes slightly and shakes her head. You know she dislikes it when people won''t stand up for themselves. "Not good? Dude, you couldn''t even get me off!"'
 			'He blushes at the comment. "Sorry..." he says meekly while looking down at the floor, unable to meet her gaze.'
 			'"What. Ever. Later losers." She walks out of his room and you hear the front door open and close a few seconds later.'
@@ -1174,13 +1135,8 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 				'He starts to say something, then stops and sighs before nodding in agreement. "You''re right. I should have stood up to her, but I shouldn''t need my girlfriend to defend me. I''m just so used to her and the other gopniks picking on me... That she intimidates me. I''m not sure what I expected from her anyway. She is who she is."'
 				*nl
 				'You give him another hug. "She''s more bark than bite. Plus, you just got to fuck one of your bullies in the ass."'
-<<<<<<< Updated upstream
-				'He nods and smiles at your comment. "Yeah. Yeah, you''re right. I guess I got her back a little; hopefully, it hurt." He blushes at his own words and glances at you. "Do you think it did?"'
-				'You smile at him and give him a reassuring look. "Hell yes, how you were pounding her ass there at the end. I bet her ass will be sore tomorrow too." He glances at you, then laughs, and you laugh with him.'
-=======
 				'He nods and smiles at your comment. "Yeah. Yeah, you''re right! I guess I got her back a little; hopefully it hurt." He blushes at his own words and glances at you. "Do you think it did?"'
 				'You smile at him and give him a reassuring look. "Hell yes, how you were pounding her there at the end. I bet her ass will be sore tomorrow too." He glances at you, then laughs, and you laugh with him.'
->>>>>>> Stashed changes
 				'"Thanks, I needed that." He kisses you and thanks you for a great time before walking you to the door. Hoping this didn''t bother him, you head on your way.'
 				act 'Leave': gt 'pod_ezd', 'etaj_1'
 			end
@@ -1190,11 +1146,7 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 				'You give him a hug, but he doesn''t really return it. "I''m sorry. I should have stood up for you."'
-<<<<<<< Updated upstream
-				'He starts to say something. "No. I''m nearly an adult and I should have stood up to her! I shouldn''t need my girlfriend to defend me, but I''m just so used to her and the other gopniks picking on me, that she intimidates me. She was right; I was pretty meek and passive until the very end when you both encouraged me."'
-=======
-				'"No. I''m nearly a adult and I should have stood up to her! I shouldn''t need my girlfriend to defend me, but I''m just so used to her and the other gopniks picking on me that she intimidates me. She was right; I was pretty meek and passive until the very end when you both encouraged me."'
->>>>>>> Stashed changes
+				'"No. I''m nearly an adult and I should have stood up to her! I shouldn''t need my girlfriend to defend me, but I''m just so used to her and the other gopniks picking on me that she intimidates me. She was right; I was pretty meek and passive until the very end when you both encouraged me."'
 				*nl
 				'You give him a hug. "She''s more bark than bite. Plus, you just got to fuck one of your bullies in the ass."'
 				'He nods and smiles at your comment. "Yeah. Yeah, you''re right! Not only did I get to fuck her, but I tore her ass up, something I never dreamed would ever happen. Yeah, I think I''m good." He kisses you and thanks you for a great time before walking you to the door. Hoping this didn''t bother him, you head on your way.'
@@ -1344,13 +1296,8 @@ if $ARGS[0] = 'strapon_first':
 		act 'Get the lube':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
-<<<<<<< Updated upstream
-			'He stops sucking on the dildo and takes off his shirt before sitting back on the bed. You smile at him. "You need to roll over." He blushes but rolls over onto his stomach as you open his nightstand and take out the lube he got to use on you before crawling onto the bed on your knees. You lube up the dildo before squirting some lube between his ass cheeks and working it in.'
-			*nl
-=======
 			'He stops sucking on the dildo and takes off his shirt before sitting back on the bed as you smile at him. "You need to roll over."'
 			'He blushes, but rolls over onto his stomach as you open his nightstand and take out the lube before crawling onto the bed on your knees. You lube up the dildo before squirting some lube between his ass cheeks and working it in.'
->>>>>>> Stashed changes
 			'He glances back over his shoulder at you. "That feels weird."'
 			'You give him a reassuring smile. "It''s okay. Just take a deep breath and relax."'
 			*nl
@@ -1384,13 +1331,8 @@ if $ARGS[0] = 'strapon_first':
 						minut += 5
 						artemQW[strapon] = -1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
-<<<<<<< Updated upstream
-						'You don''t do as he asked. "Come on baby, just relax."'
-						'His grunts turn to pained grunts. "Stop! That hurts!" He shoves you off before sitting up and glaring at you. "What the hell, <<$pcs_nickname>>?! That hurt!"'
-=======
 						'You don''t do as he asks. "Come on baby, just relax."'
 						'His moans quickly turn to pained grunts. "Stop! That hurts!" he cries out and shoves you off before sitting up and glaring at you. "What the hell, <<$pcs_nickname>>?! That hurt!"'
->>>>>>> Stashed changes
 						'You frown. "Sorry, I just got carried away. Forgive me?"'
 						'He sighs. "Okay, I forgive you, but that''s it. I''m not doing that again." You''re about to speak, but he shakes his head. "No! Never. Again. I''m going to go take a shower. Talk to you later."'
 						*nl
@@ -1403,16 +1345,11 @@ if $ARGS[0] = 'strapon_first':
 						*clr & cla
 						artemQW[strapon] = 1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
-<<<<<<< Updated upstream
-						'You ease up a bit, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... fuck... Ah..."'
-						'You grin as it sounds like he''s really starting to enjoy it. "You like taking my cock in your ass, don''t you?"'
-						'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... yes, I like it." He keeps moaning louder, which only turns you on more. Finally, after several minutes of this, his moans start to subside. "Okay, I think we need to stop. It''s starting to hurt a little again."'
-=======
+
 						'You ease up a little, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
 						'You grin. "You like taking my cock in your ass, don''t you?"'
 						'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, I like it."'
 						'He keeps moaning louder, which only turns you on more, but ater several minutes, his moans start to subside. "Okay, I think we need to stop. It''s starting to hurt again."'
->>>>>>> Stashed changes
 						gs 'arousal', 'anal_strap_give', 5
 						gs 'arousal', 'end'
 						gs 'stat'

locations/artem_sex_uni.qsrc

@@ -1131,7 +1131,7 @@ if $ARGS[0] = 'strapon_first':
 	artemQW['artem_dom'] -= 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon3.jpg"></center>'
-	''You slip on the harness and he helps you buckle it in place before he takes his pants off. You can tell he''s nervous and do your best to give him reassuring smiles, but it doesn''t seem to help. Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.''
+	'You slip on the harness and he helps you buckle it in place before he takes his pants off. You can tell he''s nervous and do your best to give him reassuring smiles, but it doesn''t seem to help. Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.'
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon4.jpg"></center>'
@@ -1141,11 +1141,9 @@ if $ARGS[0] = 'strapon_first':
 		act 'Get the lube':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
-<<<<<<< Updated upstream
-			'He stops sucking on the dildo and takes off his shirt before sitting back on the bed. You smile at him. "You need to roll over." He blushes but rolls over onto his stomach as you open his nightstand and take out the lube he got to use on you before crawling onto the bed on your knees. You lube up the dildo before squirting some lube between his ass cheeks and working it in.'
-=======
+
 			'He stops sucking on the dildo and takes off his shirt before sitting back on the bed as you smile at him. "You need to roll over." He blushes, but rolls over onto his stomach as you open his nightstand and take out the lube he got to use on you before crawling onto the bed on your knees. You lube up the dildo before squirting some between his ass cheeks and working it in.'
->>>>>>> Stashed changes
+
 			*nl
 			'He glances back over his shoulder at you. "That feels weird."'
 			'You give him a reassuring smile. "It''s okay. Just take a deep breath and relax." Once he and the dildo are lubed up, you cap the bottle of lube and toss it aside. "You ready?" He just nods in response and you line up the dildo and slowly push it into his ass until the head pops in and he hisses in pain, causing you to stop moving. "Just breathe."'

locations/artemhome.qsrc

@@ -104,14 +104,9 @@ if $ARGS[0] = 'home':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 			if artemQW['artlie'] =2 or artemQW['artembrokenheart'] = 1 or artemQW['artemblok'] = 1:
-<<<<<<< Updated upstream
-				'You stand outside the Chebotarev household, knocking on the door. The door is answered by Artem, who frowns as soon as he sees you. "I told you I never wanted to see you again! Please go away." He closes the door in your face without another word.'
-				act 'Leave': gt 'pod_ezd', 'etaj_1'
-=======
 				'You stand outside the Chebotarev household, knocking on the door. It''s soon answered by Artem, who frowns as soon as he sees you. "I told you I never wanted to see you again! Please go away."'
 				'He closes the door in your face without another word.'
 				act 'Leave': gt'pod_ezd','etaj_1'
->>>>>>> Stashed changes
 			else
 				'You stand outside the Chebotarev household, hoping that Artem will come to the door.'
 				'Artem opens the door smiling. " Come in, I was just playing some games."'
@@ -192,11 +187,7 @@ if $ARGS[0] = 'home':
 			'You stand in the hallway, but it appears that nobody is home.'
 		end
 	end
-<<<<<<< Updated upstream
 	act 'Leave': gt 'pod_ezd', 'etaj_1'
-=======
-	act 'Leave': gt 'pod_ezd','etaj_1'
->>>>>>> Stashed changes
 end
 
 if $ARGS[0] = 'hallway':
@@ -225,13 +216,8 @@ if $ARGS[0] = 'hallway':
 			act 'Parents Room': gt 'artemhome','artemparents'
 		else
 			'Artem is standing nearby, looking at you expectantly. "What''s up, <<$pcs_nickname>>?"'
-<<<<<<< Updated upstream
 			act '<b>Leave Artem''s apartment</b>': gt 'pod_ezd', 'etaj_1'
 			act 'Let''s go to your room':ArtemLoc=2&gt 'artemhome', 'artemroom'
-=======
-			act 'Leave Artem''s apartment': gt'pod_ezd','etaj_1'
-			act 'Let''s go to your room': ArtemLoc = 2 & gt 'artemhome','artemroom'
->>>>>>> Stashed changes
 		end
 	end
 end
@@ -451,11 +437,7 @@ if $ARGS[0] = 'artemroom':
 											gs 'arousal', 'kiss', 20
 											gs 'arousal', 'end'
 											gs 'stat'
-<<<<<<< Updated upstream
 											act 'Move away from the door':gt 'pod_ezd', 'etaj_1'
-=======
-											act 'Move away from the door': gt 'pod_ezd','etaj_1'
->>>>>>> Stashed changes
 										end
 									end
 								end
@@ -844,11 +826,7 @@ if $ARGS[0] = 'livingroom':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/livingroom/watchplay.jpg"></center>'
 					'You shake your head. "No, I need to get going. Maybe next time."'
 					'He looks disappointed. "Oh, okay. See you at school then."'
-<<<<<<< Updated upstream
 					act 'Leave': gt 'pod_ezd', 'etaj_1'
-=======
-					act 'Leave': gt 'pod_ezd','etaj_1'
->>>>>>> Stashed changes
 				end
 			end
 			act 'Play': 
@@ -870,11 +848,7 @@ if $ARGS[0] = 'livingroom':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/livingroom/watchplay.jpg"></center>'
 					'You shake your head. "I had a lot of fun playing with you, but I need to get going. Maybe next time."'
 					'He looks disappointed. "Oh, okay. See you at school then."'
-<<<<<<< Updated upstream
 					act 'Leave': gt 'pod_ezd', 'etaj_1'
-=======
-					act 'Leave': gt 'pod_ezd','etaj_1'
->>>>>>> Stashed changes
 				end
 			end
 			if lernHome > 0:
@@ -1251,11 +1225,7 @@ if $ARGS[0] = 'chat':
 		'Artem looks away from you with a blank stare in his eyes. "You know... I watched that video you wanted me to delete from Dimka''s computer," he mutters. "I can''t believe it... I was willing to do anything for you. Anything!"'
 		'He continues. "I can''t even look at you. How could you?!" He looks away from you in disgust. "Please leave, I never want to see you again."'
 		'You don''t know what to say, so just nod your head and walk out.'
-<<<<<<< Updated upstream
 		act 'Leave his apartment': gt 'pod_ezd', 'etaj_1'
-=======
-		act 'Leave his apartment': gt 'pod_ezd','etaj_1'
->>>>>>> Stashed changes
 	elseif artemQW['artlie'] = -1 and artemQW['dimka'] ! 1 and artemQW['dimkahelp'] ! daystart:
 		*clr & cla
 		artemQW['dimka'] = 1
@@ -1280,11 +1250,8 @@ if $ARGS[0] = 'chat':
 		'Artem is clueless as to what he should do and just hugs you. You''re fairly sure he knows about your reputation. Surely he must...'
 		'Eventually, you sniffle "They all know... Everyone in Pavlovsk knows!"'
 		'Artem keeps hugging you. "<<$pcs_nickname>>, I..."'
-<<<<<<< Updated upstream
 		'You break away from him and shout hysterically. "What do you mean, ''<<$pcs_nickname>>''?! No one calls me that anymore! It''s just ''<<$gnikname>>'' now..."'
-=======
-		'You break away from him and shout hysterically. "What do you mean, ''<<$pcs_nickname>>''?! No one calls me that any more! It''s just ''<<$gnikname>>'' now..."'
->>>>>>> Stashed changes
+
 		'Artem wipes the tears from your face and hugs you tightly.'
 		*nl
 		'"I still love you..." he whispers.'
@@ -1514,11 +1481,8 @@ if $ARGS[0] = 'chat':
 			*nl
 			'Tears start rolling down his cheeks as he stands up. "I thought we had something special, but I guess I was wrong. Please leave now and never come back!" You know there''s nothing you can say and trying to explain will only make things worse, so you get up and head for the door.'
 			'"I''ll see you later, okay?" you say, but he turns away from you. Once you close the door, you can hear him crying. Not sure what else to do, you just leave.'
-<<<<<<< Updated upstream
 			act 'Leave': gt 'pod_ezd', 'etaj_1'
-=======
-			act 'Leave': gt 'pod_ezd','etaj_1'
->>>>>>> Stashed changes
+
 		end
 		act 'Yes':
 			*clr & cla
@@ -1782,16 +1746,11 @@ if $ARGS[0] = 'chat':
 					'You decide to see if Artem wants to have another threesome with Anushka. "I was thinking, since you had fun last time when we had a threesome with Anushka, what would you say about doing it again?"'
 					'He seems a little surprised. "Yeah, she said maybe, but that sounded more like a polite no to me..." He pauses and gives you a hopeful look. "Do you think she might be willing to do it again?" He''s trying to hide his eagerness from you.'
 					*nl
-<<<<<<< Updated upstream
-					'You nod. "Yeah, I think she would be into it. Do you want me to?"'
-					'He blushes but nods. "Yeah. Yeah, I think I do."'
-					'You smile at his blush. "Ok next time I see her I will ask." He just nods to that and the two of you talk about last time for a little bit.'
-=======
 					'You nod. "Yeah, I think I she''d be into it. Do you want me to ask?"'
-					'He blushes, but nods. "Yeah. Yeah, I think I do."'
+					'He blushes but nods. "Yeah. Yeah, I think I do."'
 					'You smile. "Okay, next time I see her, I''ll ask."'
 					'He just nods to that and the two of you talk about last time.'
->>>>>>> Stashed changes
+
 					act 'Stop talking': gt 'artemhome', 'artemroom'
 					act 'Keep talking': gt 'artemhome', 'chat'
 				end
@@ -1807,18 +1766,12 @@ if $ARGS[0] = 'chat':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk2.jpg"></center>'
 					if artemQW['rough_anal_nush'] = 2 or anushkaQW['artem_dom'] = 1:
-<<<<<<< Updated upstream
-						'You give him a kiss. "So, are you ready to have a threesome Nush again?"'
-						'Artem looks into your eyes and nods with a confident smile. "Oh yeah, I''m ready. This time I''m going to totally make her my little bitch, I am going to tear her little pussy and tight ass up." He seems very eager for a second go around.'
-						'You smile and give him a reassuring pat on the leg as you look at him. "Don''t get to carried away, we all want to have fun and YOUR little bitch?"'
-						'He blushes a bit at your last comment. "I know, I won''t be too rough. I just want her to know after today that when we have our fun together, I own her ass and she is OUR little bitch." He says with a smile. You laugh and shake your head at his comment.'
-=======
 						'You give him a kiss. "So, are you ready to have a threesome with Nush again?"'
 						'He looks into your eyes and nods with a confident smile. "Oh yeah, I''m ready. This time I''m going to totally make her my little bitch! I''m going to tear her little pussy and tight ass up!" He seems very eager for a second go around.'
 						'You smile and give him a reassuring pat on the leg as you look at him. "Don''t get too carried away. We all want to have fun and... Wait, <i>your</i> little bitch?"'
 						'He blushes. "I know, I won''t be too rough. I just want her to know after today that when we have our fun together, I own her ass and she''s OUR little bitch," he says with a smile.'
-						'You laugh and shake you head at his comment.'
->>>>>>> Stashed changes
+						'You laugh and shake your head at his comment.'
+
 					else
 						'You give him a kiss. "So, are you ready to have a threesome with Nush again?"'
 						'He looks into your eyes and nods with a confident smile. "Yeah, I''m ready. This time will be different, no holding back. I''m going to show her who''s the boss." You think he''s more talking to himself than you at this point.'
@@ -1856,12 +1809,9 @@ if $ARGS[0] = 'chat':
 					*nl
 					'You text back. "Just send a text when you''re here and he''ll come answer the door."'
 					'She just texts back several more sexual innuendo emojis.'
-<<<<<<< Updated upstream
-					'You glance over at him, you know he read along but you tell him anyways. "Well, her ass slutty as is on the way for your fucking pleasure." He laughs then gets up to tidy the room while you wait for her, stopping at his dresser and digging into the bottom drawer before setting a bottle of lube down on the end table. Afterwards, he sits back down next to you to wait for Anushka to show up.'
-=======
-					'You glance over at him. "Her ass slutty as is on the way for your fucking pleasure."'
-					'He laughs then gets up to tidy the room while you wait for her, stopping at his dresser and digging into the bottom drawer before setting a bottle of lube down on the end table. Afterwards he sits back down next to you to wait for Anushka to show up.'
->>>>>>> Stashed changes
+					'You glance over at him. "Her ass slutty ass is on the way for your fucking pleasure."'
+					'He laughs then gets up to tidy the room while you wait for her, stopping at his dresser and digging into the bottom drawer before setting a bottle of lube down on the end table. Afterward he sits back down next to you to wait for Anushka to show up.'
+
 					gs 'arousal', 'kiss', 1
 					gs 'stat'
 					act 'Wait for Anushka': gt 'artem_nush_sex', 'anushka_3some2'
@@ -2000,13 +1950,10 @@ if $ARGS[0] = 'artemgirlfriend':
 				gs 'arousal', 'end'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
-<<<<<<< Updated upstream
-				'You pull your hand away and climb off him. "No, I can''t... not yet. I still want to wait."'
-				'He looks visibly disappointed but nods and smiles. "Sure, I understand. I don''t want to pressure you, so whenever you''re ready is fine."'
-=======
+
 				'You pull your hand away and climb off him. "No, I can''t... Not yet. I still want to wait."'
-				'He looks visibly disappointed, but nods and smiles. "Sure, I understand. I don''t want to pressure you, so whenever you''re ready is fine."'
->>>>>>> Stashed changes
+				'He looks visibly disappointed but nods and smiles. "Sure, I understand. I don''t want to pressure you, so whenever you''re ready is fine."'
+
 				act 'Talk to him': gt 'artemhome', 'chat'
 			end
 		else
@@ -2018,17 +1965,10 @@ end
 if $ARGS[0] = 'timecheck':
 	if hour < 6:
 		'It''s too early to be running around in Artem''s apartment. You should leave.'
-<<<<<<< Updated upstream
 		act '<b>Leave Artem''s apartment</b>': gt 'pod_ezd', 'etaj_1'
 	elseif hour > 22:
 		'It''s too late to be running around in Artem''s apartment. You should leave.'
 		act '<b>Leave Artem''s apartment</b>': gt 'pod_ezd', 'etaj_1'
-=======
-		act 'Leave Artem''s apartment': gt 'pod_ezd','etaj_1'
-	elseif hour > 22:
-		'It''s too late to be running around in Artem''s apartment. You should leave.'
-		act 'Leave Artem''s apartment': gt 'pod_ezd','etaj_1'
->>>>>>> Stashed changes
 	end
 end
 

locations/gschool_lessons1.qsrc

@@ -103,12 +103,9 @@ if $ARGS[0] = 'russian':
 					gs 'fame', 'pav', 'sex', 3
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashpantiesb' + rand(1,3) + '.jpg"></center>'
-<<<<<<< Updated upstream
-					'Near the end of class, you get up and head towards Mr. Yenotin''s desk.  You make a point of acting like you''re checking one of the books for something. With a final glance to make sure Mr. Yenotin isn''t looking, you pull up the back of your skirt and expose your panty-clad ass to the class. A few of the other students notice what you''re doing and draw each other''s attention to it. Most of them either grin, smile or even laugh at your antics. All but Lesco, who stares with his mouth open.'
-=======
 					'Near the end of class, you get up and head towards Mr. Yenotin''s desk.  You make a point of acting like you''re checking one of the books for something. With a final glance to make sure Mr. Yenotin isn''t looking, you pull up the back of your skirt and expose your panty clad ass to the class.'
 					'A few of the other students notice what you''re doing and draw each other''s attention to it. Most of them either grin, smile or even laugh at your antics. All but Lesco, who stares with his mouth open.'
->>>>>>> Stashed changes
+
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 				end
 			else
@@ -680,12 +677,10 @@ if $ARGS[0] = 'geography':
 					gs 'fame', 'pav', 'sex', 3
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashpantiesb' + rand(1,3) + '.jpg"></center>'
-<<<<<<< Updated upstream
-					'Near the end of class, you get up and act like you''re checking one of the books near Mrs. Sokoloff''s desk. After making sure Mrs. Sokoloff isn''t looking, you pull up the back of your skirt and expose your panty-clad ass to anyone looking. Artem''s mouth drops open and he just stares at you while Andrey, Valentin, Vanya and Lazar grin at what you''re doing. Stasya starts texting on her phone, likely telling everyone in school what you just did while Vitek tries to take a picture, but you flip your skirt back down before he gets his phone up. '
-=======
+
 					'Near the end of class, you get up and act like you''re checking one of the books near Mrs. Sokoloff''s desk. After making sure Mrs. Sokoloff isn''t looking, you pull up the back of your skirt and expose your panty clad ass to anyone looking.'
 					'Artem''s mouth drops open and he just stares at you while Andrey, Valentin, Vanya and Lazar grin at what you''re doing. Stasya starts texting on her phone, likely telling everyone in school what you just did while Vitek tries to take a picture, but you flip your skirt back down before he gets his phone up. '
->>>>>>> Stashed changes
+
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 				end
 			else
@@ -1225,12 +1220,10 @@ if $ARGS[0] = 'history':
 					gs 'fame', 'pav', 'sex', 3
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashpantiesb' + rand(1,3) + '.jpg"></center>'
-<<<<<<< Updated upstream
-					'Near the end of class, you get up and act like you''re checking one of the books near Mrs. Sokoloff''s desk. After making sure Mrs. Sokoloff isn''t looking, you pull up the back of your skirt and expose your panty-clad ass to anyone looking. Petka''s mouth drops open and he just stares at you while the rest of the class either grin or smile at what you''re doing. Lina starts texting on her phone, likely telling everyone in school what you just did while Roman tries to take a picture, but you drop your skirt back in place before he gets his phone up. '
-=======
+
 					'Near the end of class, you get up and act like you''re checking one of the books near Mrs. Sokoloff''s desk. After making sure Mrs. Sokoloff isn''t looking, you pull up the back of your skirt and expose your panty clad ass to anyone looking.'
 					'Petka''s mouth drops open and he just stares at you while the rest of the class either grin or smile at what you''re doing. Lina starts texting on her phone, likely telling everyone in school what you just did while Roman tries to take a picture, but you drop your skirt back in place before he gets his phone up. '
->>>>>>> Stashed changes
+
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 				end
 			else

locations/gschool_lessons2.qsrc

@@ -110,13 +110,10 @@ if $ARGS[0] = 'computer':
 					gs 'fame', 'pav', 'sex', 3
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashpantiesb' + rand(1,3) + '.jpg"></center>'
-<<<<<<< Updated upstream
-					'Near the end of class, you get up and act like you''re checking one of the books near Mr. Ivanov''s desk. After making sure Mr. Ivanov isn''t looking, you pull up the back of your skirt and expose your panty-clad ass to anyone looking. A few of the other students notice what you''re doing.' 
-					'Artem''s mouth drops open and he just stares at your ass while Sonia grins, Zinaida gives you a slightly disgusted look before turning away, Anushka and Alyona smile about it and Lizaveta starts texting on her phone. Vasily tries to take a picture but you drop your skirt back in place before he gets his phone up.'
-=======
+
 					'Near the end of class, you get up and act like you''re checking one of the books near Mr. Ivanov''s desk. After making sure Mr. Ivanov isn''t looking, you pull up the back of your skirt and expose your panty clad ass to anyone looking.'
 					'A few of the other students notice what you''re doing: Artem''s mouth drops open and he just stares at your ass while Sonia grins, Zinaida gives you a slightly disgusted look before turning away, Anushka and Alyona smile about it and Lizaveta starts texting on her phone. Vasily tries to take a picture but you drop your skirt back in place before he gets his phone up.'
->>>>>>> Stashed changes
+
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 				end
 			else
@@ -699,12 +696,10 @@ if $ARGS[0] = 'science':
 					gs 'fame', 'pav', 'sex', 3
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashpantiesb' + rand(1,3) + '.jpg"></center>'
-<<<<<<< Updated upstream
-					'Near the end of class, you get up and act like you''re checking one of the books near Miss Orlov''s desk. After making sure Miss Orlov isn''t looking, you pull up the back of your skirt and expose your panty-clad ass to anyone looking. Fedor''s mouth drops open and he just stares at your ass, Andrey and Vanya grin, Stasya gives you an annoyed look when Andrey reacts and Irina starts texting on her phone.'
-=======
+
 					'Near the end of class, you get up and act like you''re checking one of the books near Miss Orlov''s desk. After making sure Miss Orlov isn''t looking, you pull up the back of your skirt and expose your panty clad ass to anyone looking.'
 					'Fedor''s mouth drops open and he just stares at your ass, Andrey and Vanya grin, Stasya gives you an annoyed look when Andrey reacts and Irina starts texting on her phone.'
->>>>>>> Stashed changes
+
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 				end
 			else
@@ -1149,12 +1144,10 @@ if $ARGS[0] = 'music':
 					gs 'fame', 'pav', 'sex', 3
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashpantiesb' + rand(1,3) + '.jpg"></center>'
-<<<<<<< Updated upstream
-					'Near the end of class, you get up and act like you''re checking one of the books near Mr. Vasilyev''s desk. After making sure Mr. Vasilyev isn''t looking, you pull up the back of your skirt and expose your panty-clad ass to anyone looking. Petka''s mouth drops open and he just stares at you, Katja looks shocked then grins at what you''re doing, Bella gives you a slightly disgusted look before turning away, Lariska and Lina smile about it before Lina starts texting on her phone. Lavrenti tries to take a picture, but you drop your skirt back in place before he gets his phone up.'
-=======
+
 					'Near the end of class, you get up and act like you''re checking one of the books near Mr. Vasilyev''s desk. After making sure Mr. Vasilyev isn''t looking, you pull up the back of your skirt and expose your panty clad ass to anyone looking.'
 					'Petka''s mouth drops open and he just stares at you, Katja looks shocked then grins at what you''re doing, Bella gives you a slightly disgusted look before turning away, Lariska and Lina smile about it before Lina starts texting on her phone. Lavrenti tries to take a picture, but you drop your skirt back in place before he gets his phone up.'
->>>>>>> Stashed changes
+
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 				end
 			else
@@ -1691,12 +1684,10 @@ if $ARGS[0] = 'biology':
 					gs 'fame', 'pav', 'sex', 3
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashpantiesb' + rand(1,3) + '.jpg"></center>'
-<<<<<<< Updated upstream
-					'Near the end of class, you get up and act like you''re checking one of the books near Miss Orlov''s desk. After making sure Miss Orlov isn''t looking, you pull up the back of your skirt and expose your panty-clad ass to anyone looking. Lesco and Artem''s mouths drop open as they just stare at you while Dan, Lavrenti and Lazar grin. Irina starts texting on her phone, likely telling everyone about what you just did.'
-=======
+
 					'Near the end of class, you get up and act like you''re checking one of the books near Miss Orlov''s desk. After making sure Miss Orlov isn''t looking, you pull up the back of your skirt and expose your panty clad ass to anyone looking.'
 					'Lesco and Artem''s mouths drop open as they just stare at you while Dan, Lavrenti and Lazar grin. Irina starts texting on her phone, likely telling everyone about what you just did.'
->>>>>>> Stashed changes
+
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'biology'
 				end
 			else

locations/gschool_lessons3.qsrc

@@ -574,12 +574,9 @@ if $ARGS[0] = 'art':
 						gs 'flash', 'panties', 'indoors', 1
 						gs 'fame', 'pav', 'sex', 3
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashpantiesb' + rand(1,3) + '.jpg"></center>'
-<<<<<<< Updated upstream
-						'Near the end of class, you get up and act like you''re checking one of the books near Mr. Vasilyev''s desk. After making sure Mr. Vasilyev isn''t looking, you pull up the back of your skirt and expose your panty-clad ass to anyone looking. Feofan''s mouth drops open and he just stares at you, Anushka grins, Zinaida gives you a slightly disgusted look before turning away and Katja smiles at you. Svyatoslav tries to take a picture, but you drop your skirt back in place before he gets his phone up.'
-=======
 						'Near the end of class, you get up and act like you''re checking one of the books near Mr. Vasilyev''s desk. After making sure Mr. Vasilyev isn''t looking, you pull up the back of your skirt and expose your panty clad ass to anyone looking.'
 						'Feofan''s mouth drops open and he just stares at you, Anushka grins, Zinaida gives you a slightly disgusted look before turning away and Katja smiles at you. Svyatoslav tries to take a picture, but you drop your skirt back in place before he gets his phone up.'
->>>>>>> Stashed changes
+
 						act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
 					end
 				else

locations/gschool_lessons4.qsrc

@@ -1308,18 +1308,17 @@ if $ARGS[0] = 'shower2':
 			end
 		end
 	elseif gymshower >= 5 and gymshower <= 7:
-		if pcs_pubes >= 40:
-			gt 'gschool_lessons4', 'pube_bully'
+
 		if pcs_pubes > 25:
-			gt'gschool_lessons4','pube_bully'
+			gt 'gschool_lessons4', 'pube_bully'
 		elseif grupTipe = 1 or grupTipe = 2:
 			gt'gschool_lessons4', 'pube_compliment'
-!!		elseif grupTipe = 4 or grupTipe = 2:
-!!			
+			!!elseif grupTipe = 4 or grupTipe = 2:
+			
 		else
 			jump 'gymshower_loop'
 		end
-!!	elseif gymshower = 6 and grupTipe = 5 and fame['pav_slut'] > 250:
+		!!elseif gymshower = 6 and grupTipe = 5 and fame['pav_slut'] > 250:
 		
 	else
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'