diff --git a/rpg-docs/client/style/main.scss b/rpg-docs/client/style/main.scss
index 043ae7bb..a282ab4f 100644
--- a/rpg-docs/client/style/main.scss
+++ b/rpg-docs/client/style/main.scss
@@ -57,7 +57,6 @@ paper-button {
 	cursor: pointer;
 }
 
-<<<<<<< HEAD
 .pre-wrap, .prewrap{
 	white-space: pre-wrap;
 }
@@ -68,8 +67,8 @@ paper-button {
 
 .fullwidth {
 	width: 100%;
-=======
+}
+
 .fab-buffer {
     height: 100px;
->>>>>>> origin/master
 }
diff --git a/rpg-docs/client/views/character/stats/attributeDialog/strengthDialog/strengthDialog.js b/rpg-docs/client/views/character/stats/attributeDialog/strengthDialog/strengthDialog.js
new file mode 100644
index 00000000..e69de29b