diff --git a/app/overview/styles/index.scss b/app/overview/styles/index.scss
index cbe07ca..a7b2878 100644
--- a/app/overview/styles/index.scss
+++ b/app/overview/styles/index.scss
@@ -1 +1,9 @@
-@import "./system-overview.scss";
\ No newline at end of file
+<<<<<<< HEAD
+@import "./system-overview.scss";
+=======
+@import "./bmc-reboot.scss";
+@import "./log.scss";
+@import "./power-operations.scss";
+@import "./system-overview.scss";
+@import "./unit-id.scss";
+>>>>>>> 4c1a3dd... Major update to code structure