CSS should be merged correctly now

src/project/static/css/style.css

@@ -94,7 +94,7 @@ h6 {
 }
 
 a {
-  <<<<<<< HEAD font-weight: 500;
+  font-weight: 500;
   color: var(--splash);
   text-decoration: none;
   cursor: pointer;
@@ -105,10 +105,6 @@ hr {
   height: 0;
   border: 0;
   border-bottom: 1px solid var(--dark-custard);
-  =======font-weight: 500;
-  color: var(--splash);
-  text-decoration: none;
-  >>>>>>>bdc2d8717cbcab1795b1b2dc4f08f83242e4a4ca
 }
 
 body {
@@ -267,12 +263,7 @@ div.services {
 
 div.services>div,
 div.infobox {
-  <<<<<<< HEAD background: var(--light);
-  padding: var(--double-space);
-  border-radius: 6px;
-  flex: 240px;
-  max-width: 420px;
-  =======background: var(--light);
+  background: var(--light);
   padding: var(--double-space);
   border-radius: 6px;
   flex: 240px;
@@ -294,111 +285,6 @@ div.services>div>div.description>p {
   margin-top: var(--half-space);
 }
 
-div.services>div>a,
-a.button,
-button {
-  display: block;
-  color: var(--light);
-  background: var(--splash);
-  padding: var(--space) var(--double-space);
-  border-radius: 3px;
-  opacity: 0.9;
-  cursor: pointer;
-  text-align: center;
-  border: 0;
-  font-weight: 600;
-  letter-spacing: 0.03em;
-  text-decoration: none;
-}
-
-div.services>div>a:hover,
-a.button:hover,
-button:hover {
-  opacity: 1.0;
-}
-
-article table {
-  width: 100%;
-  border-spacing: 0;
-  margin: var(--space) 0;
-}
-
-article table thead th {
-  text-align: left;
-}
-
-article table tbody tr:nth-child(odd) {
-  background: var(--medium-dust);
-}
-
-article table thead th,
-article table tbody td {
-  padding: var(--half-space);
-}
-
-form>div {
-  margin: 0 0 var(--double-space);
-}
-
-form>div>label {
-  display: block;
-  margin: 0 0 6px;
-}
-
-form>div>input[type="text"],
-form>div>input[type="password"] {
-  border: 2px solid var(--twilight);
-  border-radius: 6px;
-  padding: 8px;
-  background: var(--light-dust);
-  width: 100%;
-}
-
-#login {
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-#loginbox {
-  border-radius: var(--space);
-  border: 6px solid white;
-  width: 800px;
-  height: 500px;
-
-  display: flex;
-  flex-flow: row;
-}
-
-#loginbox>div {
-  padding: var(--double-space);
-  flex: 1;
-}
-
-#loginbox label {
-  color: var(--twilight);
-}
-
-#loginbox>div.login {
-  background: var(--light-dust);
-  >>>>>>>bdc2d8717cbcab1795b1b2dc4f08f83242e4a4ca display: flex;
-  flex-flow: column;
-  justify-content: space-between;
-}
-
-div.infobox button {
-  margin-top: var(--double-space);
-}
-
-div.services>div>div.description {
-  margin-bottom: var(--double-space);
-}
-
-div.services>div>div.description>p {
-  margin-top: var(--half-space);
-}
-
 div.services>div>a,
 a.button,
 button {
@@ -501,7 +387,7 @@ input[type="email"] {
   padding: 8px;
   background: var(--light-dust);
   width: 100%;
-  color: var(--dark);
+  color : var(--dark);
 }
 
 form fieldset {
@@ -644,4 +530,4 @@ span.time_remaining {
 
 .pagination .page-item.disabled .page-link {
   cursor: default;
-}
+}