fix merge issue; refactoring

spring-mvc-java/src/main/java/com/baeldung/model/Foo.java

@@ -0,0 +1,19 @@
+package com.baeldung.model;
+
+import com.baeldung.aop.annotations.Entity;
+
+@Entity
+public class Foo {
+    private Long id;
+    private String name;
+
+    public Foo(Long id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Foo{" + "id=" + id + ", name='" + name + '\'' + '}';
+    }
+}