Fixed merge bbugs

src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java

@@ -42,7 +42,7 @@ public class LandmarksController {
 
         } else {
             // converts valid response using Location constructor into a submittable format to the sql table
-            Location loc = new Location(landmarks.getLandmarkName(), landmarks.getLandmarkEmail(), landmarks.getLandmarkDescription(), landmarks.getLandmarkLocation(), landmarks.getTrailID(), false);
+            Location loc = new Location(landmarks.getLandmarkID(), landmarks.getLandmarkName(), landmarks.getLandmarkEmail(), landmarks.getLandmarkDescription(), landmarks.getLandmarkLocation(), landmarks.getTrailID(), false);
             locationRepository.addLocation(loc); // adds valid landmark to locations table
             ModelAndView modelAndView = new ModelAndView("redirect:/home");
             return modelAndView;

src/main/resources/templates/fragments/trailsPageFrags.html

@@ -113,7 +113,7 @@
         </div>
         <hr style="height:15px; visibility:hidden;" />
         <H2 id="return">
-            <a href="/home">Home</a></H2>
+            <a href="/mobile-home">Home</a></H2>
         <hr style="height:5px; visibility:hidden;" />
     </article>
     <hr style="height:40px; visibility:hidden;" />