ok

src/TestPanel.js

@@ -416,13 +416,9 @@ useEffect(()=>{
   <img alt="" src={process.env.PUBLIC_URL+"/icons/status/poison.png"} /> {(p.poisonResist*100).toFixed(1)}%<br />
 </div>
 
-<<<<<<< HEAD
-<div style={{gridArea:"dmgRes"}}><span>Damage Resist.</span></div><div style={{gridArea:"dmgRes2"}}>{(p.damageResist*100).toFixed(1)}%</div>
-
-=======
 <div style={{gridArea:"dmgRes"}}>Damage Resist.</div><div style={{gridArea:"dmgRes2"}}>{(p.damageResist*100).toFixed(1)}%</div>
 <button onClick={()=>{SaveData()}}>Save</button>
->>>>>>> 81dd37a4b357885199c35d836d6de68da815f44c
+
       </div>
       </div>
       <div className="box">