resolved conflicts

spring-boot/src/main/java/org/baeldung/boot/DemoApplication.java

@@ -10,4 +10,5 @@ public class DemoApplication {
         System.setProperty("spring.config.name", "demo");
         SpringApplication.run(DemoApplication.class, args);
     }
+
 }

spring-boot/src/main/java/org/baeldung/boot/model/Foo.java

@@ -36,5 +36,4 @@ public class Foo implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
-
 }