1 files changed, 7 insertions, 0 deletions

diff --git a/npcs.xml b/npcs.xml
index 3c7d9af5..9d1e6860 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -940,7 +940,14 @@
   </npc>
   <!-- Blonde girl with spinning wheel by Chef Chelios-->
   <npc id="376">
+<<<<<<< HEAD
     <sprite>npcs/npc-weaver.xml</sprite>
+=======
+    <sprite>races/talponian-female.xml</sprite>
+    <sprite>hairstyles/hairstyle11-female.xml|#dbd41e,867f1a,a49c2e,b2aa4f,c6c170,d9d394,e0dcb3</sprite>
+    <sprite>equipment/chest/sorcerer-robe-female.xml|#115511,22aa22,99dd99;#FFF528</sprite>
+    <sprite variant="1">npcs/weaver-wheel.xml</sprite>
+>>>>>>> 50ecfbb... mer
   </npc>
   <!-- Trapper -->
   <npc id="377">