* Merged Credits Conflicts

CREDITS.csv

@@ -544,15 +544,6 @@ eyes/cyclops,"original by kirts, repositioned by JaidynReiman along with shading
 eyes/eyebrows/thick,,"ElizaWy","OGA-BY 3.0",https://github.com/ElizaWy/LPC/tree/main/Characters/Hair,https://opengameart.org/content/expanded-universal-lpc-spritesheet-idle-run-jump-lpc-revised-combat-and-assets,,,,,,,,,,,,,,OK
 eyes/eyebrows/thin,,"ElizaWy","OGA-BY 3.0",https://github.com/ElizaWy/LPC/tree/main/Characters/Hair,https://opengameart.org/content/expanded-universal-lpc-spritesheet-idle-run-jump-lpc-revised-combat-and-assets,,,,,,,,,,,,,,OK
 facial,,,,,,,,,,,,,,,,,,,
-<<<<<<< HEAD
-facial/earrings/simple,"base earring was listed as CC0, but the ""gold.png"" earring was listed as CC-BY-SA, so I kept these the same after renaming, but if clarified we can make this entry the real one",bluecarrot16,CC0,https://opengameart.org/content/lpc-pirates,https://opengameart.org/content/expanded-ulpc-head-accessories-facial-assets-hats-helmets,,,,,,,,,,,,,,
-facial/earrings/simple/left,,bluecarrot16,CC0,https://opengameart.org/content/lpc-pirates,https://opengameart.org/content/expanded-ulpc-head-accessories-facial-assets-hats-helmets,,,,,,,,,,,,,,OK
-facial/earrings/simple/right,,bluecarrot16,CC0,https://opengameart.org/content/lpc-pirates,https://opengameart.org/content/expanded-ulpc-head-accessories-facial-assets-hats-helmets,,,,,,,,,,,,,,OK
-facial/glasses/round,,"bluecarrot16, Thane Brimhall (pennomi), laetissima","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/clothing-facial-features-and-ui-elements,https://opengameart.org/content/lpc-gentleman,https://opengameart.org/content/expanded-ulpc-head-accessories-facial-assets-hats-helmets,,,,,,,,,,,,,OK
-facial/glasses/shades,"Original by Pennomi, repositioning and recolors by JaidynReiman.","JaidynReiman, Thane Brimhall (pennomi)","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-base-character-expressions,https://opengameart.org/content/expanded-ulpc-head-accessories-facial-assets-hats-helmets,,,,,,,,,,,,,,OK
-facial/glasses/nerd,"Original by Pennomi, repositioning and recolors by JaidynReiman.","JaidynReiman, Thane Brimhall (pennomi)","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-base-character-expressions,https://opengameart.org/content/expanded-ulpc-head-accessories-facial-assets-hats-helmets,,,,,,,,,,,,,,OK
-facial/glasses/secretary,"Original by Pennomi, repositioning and recolors by JaidynReiman.","JaidynReiman, Thane Brimhall (pennomi)","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-base-character-expressions,https://opengameart.org/content/expanded-ulpc-head-accessories-facial-assets-hats-helmets,,,,,,,,,,,,,,OK
-=======
 facial/earrings/simple,"base earring was listed as CC0, but the ""gold.png"" earring was listed as CC-BY-SA, so I kept these the same after renaming, but if clarified we can make this entry the real one",bluecarrot16,CC0,https://opengameart.org/content/lpc-pirates,,,,,,,,,,,,,,,
 facial/earrings/simple/left,,bluecarrot16,CC-BY-SA 3.0,https://opengameart.org/content/lpc-pirates,,,,,,,,,,,,,,,OK
 facial/earrings/simple/right,,bluecarrot16,CC-BY-SA 3.0,https://opengameart.org/content/lpc-pirates,,,,,,,,,,,,,,,OK
@@ -569,7 +560,6 @@ facial/glasses/round,,"bluecarrot16, Thane Brimhall (pennomi), laetissima","CC-B
 facial/glasses/shades,"Original by Pennomi, repositioning and recolors by JaidynReiman.","JaidynReiman, Thane Brimhall (pennomi)","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-base-character-expressions,,,,,,,,,,,,,,,OK
 facial/glasses/nerd,"Original by Pennomi, repositioning and recolors by JaidynReiman.","JaidynReiman, Thane Brimhall (pennomi)","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-base-character-expressions,,,,,,,,,,,,,,,OK
 facial/glasses/secretary,"Original by Pennomi, repositioning and recolors by JaidynReiman.","JaidynReiman, Thane Brimhall (pennomi)","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-base-character-expressions,,,,,,,,,,,,,,,OK
->>>>>>> e87766c66ff1bed22b1c6138ffe5d2e1b6668335
 facial/glasses/glasses,,"ElizaWy","OGA-BY 3.0",https://github.com/ElizaWy/LPC/tree/main/Characters/Head%20Accessories,https://opengameart.org/content/expanded-universal-lpc-spritesheet-idle-run-jump-lpc-revised-combat-and-assets,,,,,,,,,,,,,,OK
 facial/glasses/halfmoon,,"ElizaWy","OGA-BY 3.0",https://github.com/ElizaWy/LPC/tree/main/Characters/Head%20Accessories,https://opengameart.org/content/expanded-universal-lpc-spritesheet-idle-run-jump-lpc-revised-combat-and-assets,,,,,,,,,,,,,,OK
 facial/glasses/sunglasses,,"Michael Whitlock (bigbeargames), Thane Brimhall (pennomi)","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-base-character-expressions,https://opengameart.org/content/expanded-ulpc-head-accessories-facial-assets-hats-helmets,,,,,,,,,,,,,,OK