JAVA-960: Fix conflicts

spring-resttemplate/src/main/java/com/baeldung/resttemplate/configuration/SpringConfig.java

@@ -26,8 +26,4 @@ public class SpringConfig {
         return new RestTemplateBuilder(customRestTemplateCustomizer());
     }
 
-    @Bean
-    public RestTemplate restTemplate() {
-        return new RestTemplate();
-    }
 }

spring-resttemplate/src/main/java/com/baeldung/resttemplate/lists/service/EmployeeService.java

@@ -7,7 +7,7 @@ import com.baeldung.resttemplate.lists.dto.Employee;
 import java.util.ArrayList;
 import java.util.List;
 
-@Service
+@Service("EmployeeListService")
 public class EmployeeService
 {
     public List<Employee> getAllEmployees()

spring-resttemplate/src/main/java/com/baeldung/sampleapp/web/controller/MyFooController.java

@@ -20,7 +20,7 @@ import com.baeldung.sampleapp.web.dto.Foo;
 import com.baeldung.sampleapp.web.exception.ResourceNotFoundException;
 
 @Controller
-@RequestMapping(value = "/foos")
+@RequestMapping(value = "/foo")
 public class MyFooController {
 
     private final Map<Long, Foo> myfoos;