diff --git a/.vscode/settings.json b/.vscode/settings.json
index 277c9ff..6f3a291 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,3 @@
 {
-    "liveServer.settings.port": 5503,
-    "githubPullRequests.ignoredPullRequestBranches": [
-        "main"
-    ]
+    "liveServer.settings.port": 5501
 }
\ No newline at end of file
diff --git a/script.js b/script.js
index b0b2039..ea81a47 100644
--- a/script.js
+++ b/script.js
@@ -273,6 +273,10 @@ window.onload = function() {
     kofi_back.to("#KOFItest", {x: 200, y: 900, duration: 5});
   
     
+<<<<<<< HEAD
+  
+=======
+>>>>>>> main
 
 
 
diff --git a/styling/mediaqueries.css b/styling/mediaqueries.css
index 719b2ee..4995e36 100644
--- a/styling/mediaqueries.css
+++ b/styling/mediaqueries.css
@@ -1,6 +1,39 @@
+<<<<<<< HEAD
+@media (prefers-reduced-motion: reduce) {
+  #kid-face {
+    animation: none !important;
+  }
+  #school-face {
+    animation: none !important;
+  }
+  #door {
+    animation: none !important;
+  }
+  #left-big-window {
+    animation: none !important;
+  }
+  #right-big-window {
+    animation: none !important;
+  }
+  .sun3 {
+    animation: none !important;
+  }
+  .sun5 {
+    animation: none !important;
+  }
+  .drop {
+    animation: none !important;
+  }
+  .drop2 {
+    animation: none !important;
+  }
+  .drop3 {
+    animation: none !important;
+=======
 @media (max-width: 768px) {
   .house {
     display: none;
+>>>>>>> main
   }
 }
 @media (prefers-reduced-motion: reduce) {
diff --git a/styling/mediaqueries.css.map b/styling/mediaqueries.css.map
index 3437121..f8e10d8 100644
--- a/styling/mediaqueries.css.map
+++ b/styling/mediaqueries.css.map
@@ -1 +1,5 @@
-{"version":3,"sources":["mediaqueries.scss","mediaqueries.css"],"names":[],"mappings":"AAAA;EACE;IACE,aAAA;ECCF;AACF;ADKA;EACI;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;AACF","file":"mediaqueries.css"}
\ No newline at end of file
+<<<<<<< HEAD
+{"version":3,"sources":["mediaqueries.scss","mediaqueries.css"],"names":[],"mappings":"AAAA;EACI;IACE,0BAAA;ECCJ;EDCE;IACE,0BAAA;ECCJ;EDCE;IACE,0BAAA;ECCJ;EDCE;IACE,0BAAA;ECCJ;EDCE;IACE,0BAAA;ECCJ;EDCE;IACE,0BAAA;ECCJ;EDCE;IACE,0BAAA;ECCJ;EDCE;IACE,0BAAA;ECCJ;EDCE;IACE,0BAAA;ECCJ;EDCE;IACE,0BAAA;ECCJ;AACF;ADEE;EACE;IACE,kBAAA;IACA,8BAAA;IACA,WAAA;IACA,YAAA;ECAJ;EDGE;IACI,WAAA,EAAA,8BAAA;IACA,aAAA,EAAA,+BAAA;IACA,+BAAA,EAAA,kCAAA;ECDN;EDGE;IACE,YAAA;ECDJ;AACF","file":"mediaqueries.css"}
+=======
+{"version":3,"sources":["mediaqueries.scss","mediaqueries.css"],"names":[],"mappings":"AAAA;EACE;IACE,aAAA;ECCF;AACF;ADKA;EACI;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;EDKE;IACE,0BAAA;ECHJ;AACF","file":"mediaqueries.css"}
+>>>>>>> main
diff --git a/styling/styling.css b/styling/styling.css
index 9ecfd0f..1e54807 100644
--- a/styling/styling.css
+++ b/styling/styling.css
@@ -392,7 +392,11 @@ span {
   z-index: 0;
 }
 
+<<<<<<< HEAD
+#lack-water{
+=======
 #lack-water {
+>>>>>>> main
   position: relative;
   max-width: 40%;
   max-height: 20%;
@@ -499,7 +503,12 @@ span {
   background: linear-gradient(to bottom, #1b1c20, #a8c0ff 20%, #FFA500 40%, #FF5733 75%, #1b1c20 100%);
 }
 
+<<<<<<< HEAD
+
+#lack-water{
+=======
 #lack-water {
+>>>>>>> main
   position: relative;
   max-width: 40%;
   max-height: 20%;
@@ -522,6 +531,23 @@ span {
   justify-content: center;
 }
 
+<<<<<<< HEAD
+
+.inner-text h1 {
+  margin: auto;
+  padding: 2%;
+  margin:2%;
+  text-align: center;
+}
+
+h3{
+  font-weight: lighter;
+  margin: 3%;
+
+}
+
+
+=======
 .inner-text h1 {
   margin: auto;
   padding: 2%;
@@ -534,6 +560,7 @@ h3 {
   margin: 3%;
 }
 
+>>>>>>> main
 .inner-text {
   width: 70%;
   background: white;
diff --git a/styling/styling.css.map b/styling/styling.css.map
index dfde8d2..fa71ebb 100644
--- a/styling/styling.css.map
+++ b/styling/styling.css.map
@@ -1 +1,5 @@
-{"version":3,"sources":["styling.scss","animations.scss","styling.css","mediaqueries.scss","colors.scss"],"names":[],"mappings":"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","file":"styling.css"}
\ No newline at end of file
+<<<<<<< HEAD
+{"version":3,"sources":[],"names":[],"mappings":"","file":"styling.css"}
+=======
+{"version":3,"sources":["styling.scss","animations.scss","styling.css","mediaqueries.scss","colors.scss"],"names":[],"mappings":"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","file":"styling.css"}
+>>>>>>> main
diff --git a/styling/styling.scss b/styling/styling.scss
index ce19dce..3eb08d5 100644
--- a/styling/styling.scss
+++ b/styling/styling.scss
@@ -220,6 +220,32 @@ span {
   opacity: 0.5;
 }
 
+<<<<<<< HEAD
+  .UN-Goal-Column {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    flex-wrap: wrap;
+
+  }
+  
+  #UN__GOAL {
+    max-width: 15%;
+    max-height: 20%;
+    padding: 0;
+    z-index: 0;
+    content:url(/images/UNGoal6.png);
+  }
+  
+  #UN__GOAL__IN {
+    max-width: 15%;
+    max-height: 20%;
+    padding: 0;
+    z-index: 0;
+    content:url(/images/UNgoal6Inverted.png);
+    z-index: 2;
+  }
+=======
 .UN-Goal-Column {
   display: flex;
   flex-direction: column;
@@ -228,6 +254,7 @@ span {
   flex-wrap: wrap;
   margin-top: 200vh;
 }
+>>>>>>> main
 
 #UN__GOAL {
   position: absolute;
@@ -667,8 +694,6 @@ button:hover {
   z-index: 2;
 }
 
-
-
 .scene5 {
   height: 100vh;
   width: 100%;
@@ -690,9 +715,6 @@ button:hover {
 /*# sourceMappingURL=styling.css.map */
 
 
-
-
-
 #kid-eyes,
 #adult-eyes {
   animation: look-around 3s infinite;