[Data Corruption] Fix merge corruption

locations/npcstatic3.qsrc

@@ -729,11 +729,7 @@ npc_intel['A<<npctemp>>'] = 38
 npc_rep['A<<npctemp>>'] = 60
 hotcat_rating['A<<npctemp>>'] = 6
 !!height_metric = 171cm
-<<<<<<< HEAD
-!!height_imperial = 5'7"
-=======
 !!height_imperial = 5foot 7inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = average
 !!hair = long black hair just past her shoulders.
 !!pubic hair = shaved
@@ -764,11 +760,7 @@ npc_intel['A<<npctemp>>'] = 63
 npc_rep['A<<npctemp>>'] = 60
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 164cm
-<<<<<<< HEAD
-!!height_imperial = 5'5"
-=======
 !!height_imperial = 5foot 5inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = petite
 !!hair = long redish brown hair just past her shoulders.
 !!pubic hair = Neatly trimmed triangle
@@ -798,11 +790,7 @@ npc_intel['A<<npctemp>>'] = 49
 hotcat_rating['A<<npctemp>>'] = 7
 npc_rep['A<<npctemp>>'] = 0
 !!height_metric = 170cm
-<<<<<<< HEAD
-!!height_imperial = 5'7"
-=======
-!!height_imperial = 5foot 7inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
+!!height_imperial = 5feet 7inches
 !!body_build = toned/athletic
 !!hair = long dirty blonde hair just past her shoulders, almost always kept in a ponytail.
 !!pubic hair = Neatly trimmed triangle
@@ -833,11 +821,7 @@ npc_intel['A<<npctemp>>'] = 86
 npc_rep['A<<npctemp>>'] = 10
 hotcat_rating['A<<npctemp>>'] = 5
 !!height_metric = 152cm
-<<<<<<< HEAD
-!!height_imperial = 5'
-=======
 !!height_imperial = 5foot
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = petite
 !!hair = long brown hair just past her shoulders, almost always kept up in a bun.
 !!pubic hair = untrimmed bush
@@ -868,11 +852,7 @@ hotcat_rating['A<<npctemp>>'] = 6
 npc_rep['A<<npctemp>>'] = 120
 
 !!height_metric = 168cm
-<<<<<<< HEAD
-!!height_imperial = 5'6"
-=======
 !!height_imperial = 5foot 6inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = average
 !!hair = long black hair just past her shoulders.
 !!pubic hair = neatly trimmed landing strip
@@ -903,11 +883,7 @@ npc_intel['A<<npctemp>>'] = 76
 npc_rep['A<<npctemp>>'] = 220
 hotcat_rating['A<<npctemp>>'] = 8
 !!height_metric = 159cm
-<<<<<<< HEAD
-!!height_imperial = 5'3"
-=======
 !!height_imperial = 5foot 3inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = petite
 !!hair = medium length black hair just past her chin.
 !!pubic hair = shaved
@@ -937,11 +913,7 @@ npc_intel['A<<npctemp>>'] = 28
 hotcat_rating['A<<npctemp>>'] = 4
 npc_rep['A<<npctemp>>'] = 70
 !!height_metric = 178cm
-<<<<<<< HEAD
-!!height_imperial = 5'10"
-=======
 !!height_imperial = 5foot 10inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = muscular
 !!hair = long brown hair just past her shoulders.
 !!pubic hair = untrimmed bush
@@ -973,11 +945,7 @@ npc_intel['A<<npctemp>>'] = 47
 npc_rep['A<<npctemp>>'] = 220
 hotcat_rating['A<<npctemp>>'] = 8
 !!height_metric = 185cm
-<<<<<<< HEAD
-!!height_imperial = 6'1"
-=======
-!!height_imperial = 6foot 1inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
+!height_imperial = 6foot 1inch
 !!body_build = toned/athletic
 !!hair = black
 
@@ -1008,11 +976,7 @@ npc_intel['A<<npctemp>>'] = 37
 npc_rep['A<<npctemp>>'] = 210
 hotcat_rating['A<<npctemp>>'] = 8
 !!height_metric = 175cm
-<<<<<<< HEAD
-!!height_imperial = 5'9"
-=======
 !!height_imperial = 5foot 9inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = average
 !!hair = brown
 
@@ -1042,11 +1006,7 @@ hotcat_rating['A<<npctemp>>'] = 6
 npc_rep['A<<npctemp>>'] = 130
 npc_intel['A<<npctemp>>'] = 44
 !!height_metric = 177cm
-<<<<<<< HEAD
-!!height_imperial = 5'10"
-=======
 !!height_imperial = 5foot 10inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = average
 !!hair = brown
 
@@ -1073,11 +1033,7 @@ npc_intel['A<<npctemp>>'] = 40
 npc_rep['A<<npctemp>>'] = 320
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 182cm
-<<<<<<< HEAD
-!!height_imperial = 6'
-=======
 !!height_imperial = 6foot
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = toned/athletic
 !!hair = black
 

locations/npcstatic4.qsrc

@@ -23,12 +23,7 @@ hotcat_rating['A<<npctemp>>'] = 4
 npc_rep['A<<npctemp>>'] = 110
 npc_intel['A<<npctemp>>'] = 26
 !!height_metric = 196cm
-<<<<<<< HEAD
-!!height_imperial = 6'5"
-=======
-!!height_imperial = 6foot 5inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
-!!body_build = bodybuilder
+!!height_imperial = 6foot 5inch!!body_build = bodybuilder
 !!hair = black
 
 
@@ -57,11 +52,7 @@ hotcat_rating['A<<npctemp>>'] = 3
 npc_rep['A<<npctemp>>'] = 0
 npc_intel['A<<npctemp>>'] = 87
 !!height_metric = 173cm
-<<<<<<< HEAD
-!!height_imperial = 5'8"
-=======
 !!height_imperial = 5foot 8inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = average
 !!hair = brown
 
@@ -92,11 +83,7 @@ npc_intel['A<<npctemp>>'] = 70
 npc_rep['A<<npctemp>>'] = 60
 hotcat_rating['A<<npctemp>>'] = 6
 !!height_metric = 182cm
-<<<<<<< HEAD
-!!height_imperial = 6'
-=======
 !!height_imperial = 6foot
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = skinny
 !!hair = redish/brown
 
@@ -127,11 +114,7 @@ npc_intel['A<<npctemp>>'] = 92
 npc_rep['A<<npctemp>>'] = 20
 hotcat_rating['A<<npctemp>>'] = 4
 !!height_metric = 176cm
-<<<<<<< HEAD
-!!height_imperial = 5'10"
-=======
 !!height_imperial = 5foot 10inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = average
 !!hair = blond
 
@@ -161,11 +144,7 @@ hotcat_rating['A<<npctemp>>'] = 7
 npc_rep['A<<npctemp>>'] = 370
 npc_intel['A<<npctemp>>'] = 51
 !!height_metric = 179cm
-<<<<<<< HEAD
-!!height_imperial = 5'10"
-=======
 !!height_imperial = 5foot 10inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = average
 !!hair = black
 
@@ -196,11 +175,7 @@ npc_intel['A<<npctemp>>'] = 51
 npc_rep['A<<npctemp>>'] = 240
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 178cm
-<<<<<<< HEAD
-!!height_imperial = 5'10"
-=======
 !!height_imperial = 5foot 10inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = average
 !!hair = blond
 
@@ -230,11 +205,7 @@ hotcat_rating['A<<npctemp>>'] = 5
 npc_rep['A<<npctemp>>'] = 260
 npc_intel['A<<npctemp>>'] = 42
 !!height_metric = 178cm
-<<<<<<< HEAD
-!!height_imperial = 5'10"
-=======
 !!height_imperial = 5foot 10inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = toned/athletic
 !!hair = black
 
@@ -264,11 +235,7 @@ hotcat_rating['A<<npctemp>>'] = 5
 npc_rep['A<<npctemp>>'] = 170
 npc_intel['A<<npctemp>>'] = 34
 !!height_metric = 168cm
-<<<<<<< HEAD
-!!height_imperial = 5'6"
-=======
 !!height_imperial = 5foot 6inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = muscular
 !!hair = brown
 
@@ -298,11 +265,7 @@ hotcat_rating['A<<npctemp>>'] = 6
 npc_rep['A<<npctemp>>'] = 280
 npc_intel['A<<npctemp>>'] = 44
 !!height_metric = 183cm
-<<<<<<< HEAD
-!!height_imperial = 6'
-=======
 !!height_imperial = 6foot
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = average
 !!hair = brown
 
@@ -333,11 +296,7 @@ npc_intel['A<<npctemp>>'] = 28
 npc_rep['A<<npctemp>>'] = 0
 hotcat_rating['A<<npctemp>>'] = 1
 !!height_metric = 188cm
-<<<<<<< HEAD
-!!height_imperial = 6'2"
-=======
 !!height_imperial = 6foot 2inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = obese
 !!hair = brown
 
@@ -447,11 +406,7 @@ npc_intel['A<<npctemp>>'] = 36
 npc_rep['A<<npctemp>>'] = 120
 hotcat_rating['A<<npctemp>>'] = 5
 !!height_metric = 173cm
-<<<<<<< HEAD
-!!height_imperial = 5'8"
-=======
 !!height_imperial = 5foot 8inch
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = toned/athletic
 !!hair = brown
 
@@ -876,11 +831,7 @@ hotcat_rating['A<<npctemp>>'] = 6
 npc_rep['A<<npctemp>>'] = 140
 npc_intel['A<<npctemp>>'] = 64
 !!height_metric = 183cm
-<<<<<<< HEAD
-!!height_imperial = 6'
-=======
 !!height_imperial = 6foot
->>>>>>> f05d95aa4ff32e95e9f2fb0a204f8e04c54115a2
 !!body_build = wiry
 !!hair = black