diff --git a/The Strange/The Strange.css b/The Strange/The Strange.css
index 29c7f888f5..58908c6b9e 100644
--- a/The Strange/The Strange.css	
+++ b/The Strange/The Strange.css	
@@ -160,7 +160,11 @@
 }
 
 .charsheet .sheet-attackbox {
+<<<<<<< HEAD
   width: 40%;
+=======
+   width: 30%;
+>>>>>>> b39717224fd911e1bc1f9f65ce438894a08385ba
 }
 
 .charsheet .sheet-attackboxsmall {