diff --git a/sass/index.css b/sass/index.css
index 88dbae9..1adfce6 100644
--- a/sass/index.css
+++ b/sass/index.css
@@ -2,6 +2,7 @@ body {
   margin: 0;
   padding: 0;
   display: flex;
+<<<<<<< HEAD
   flex-direction: column;
   background-color: #EAE2B7; }
 
@@ -26,6 +27,32 @@ a {
 
 .header {
   background-color: #F77F00;
+=======
+  flex-direction: column; 
+  background-color: #03071e;
+}
+
+a {
+  color: #EAE2B7;
+  text-decoration: none;
+}
+
+.articles {
+  margin: auto;
+  width: 50%;
+  padding: 10px;
+  font-family: 'Roboto', sans-serif;
+}
+
+.navigation {
+  font-family: 'Roboto', sans-serif
+}
+
+.header {
+  background-color: #03071e;
+  color: #EAE2B7;
+  font-family: 'Roboto', sans-serif;
+>>>>>>> 7ddc9cfeffce4ded1a67c3ad37cecec023c094bb
   width: 100%;
   height: 50px;
   display: flex;