[fixed] artifacts remaining from confict (not resolved at the time)

locations/hunter_interactions.qsrc

@@ -662,11 +662,7 @@ if $ARGS[0] = 'naked_encounter':
 			hunterknowday = daystart
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude2.jpg"></center>'
-<<<<<<< HEAD
-			'You decide you do not mind the men seeing you naked. You drop your hands and let the men stare at your tits and ass all they want.'
-=======
 			'You decide you do not mind the men seeing you naked. You drop your hands and let the men stare at your naked tits and pussy all they want.'
->>>>>>> phase_1
 
             act 'Further': gt 'swamp_yard'
 			!Nudity reactions. Might need to split into more  events if it gets too massive
@@ -688,17 +684,9 @@ if $ARGS[0] = 'naked_encounter':
 					'"What in the hell are you doing you dumb girl, put something on!" says Sergei'
 					'"Seriously <<$pcs_nickname>>. It is not very ladylike to expose yourself to some men you barely know. What if we were someone with less than good intentions?" says Igor'
                 end
-                
-<<<<<<< HEAD
-			else
-=======
             else
-                
                 *clr & cla
-
                 act 'Further': gt 'swamp_yard'
-
->>>>>>> phase_1
 				if hunter_collective_opinion > 45:
 					hunter_sexual_comfort += 5
 					hunter_collective_opinion += 5