fix merge issue; refactoring

mapstruct/src/main/java/com/baeldung/entity/Person.java

@@ -0,0 +1,33 @@
+package com.baeldung.entity;
+
+public class Person {
+    
+    private String id;
+    private String name;
+    
+    public Person() {
+        
+    }
+    
+    public Person(String id, String name) {
+        super();
+        this.id = id;
+        this.name = name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}