resolve merge conflict

spring-boot-rest/pom.xml

@@ -45,6 +45,11 @@
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-rest</artifactId>
+        </dependency>
+        
         <!-- Spring HATEOAS -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

spring-boot-rest/src/main/java/com/baeldung/modelmapper/model/Subject.java

@@ -0,0 +1,37 @@
+package com.baeldung.modelmapper.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Subject {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(nullable = false)
+    private String name;
+
+    public Subject() {
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

spring-boot-rest/src/main/java/com/baeldung/modelmapper/repository/SubjectRepository.java

@@ -0,0 +1,16 @@
+package com.baeldung.modelmapper.repository;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.data.rest.core.annotation.RestResource;
+
+import com.baeldung.modelmapper.model.Subject;
+
+public interface SubjectRepository extends PagingAndSortingRepository<Subject, Long> {
+
+    @RestResource(path = "nameContains")
+    public Page<Subject> findByNameContaining(@Param("name") String name, Pageable p);
+
+}