merge conflict fix

pom.xml

src/main/java/com/example/demo/DemoApplication.java

...in/java/com/example/demo/controller/MemberController.java

...main/java/com/example/demo/controller/TestController.java

src/main/java/com/example/demo/dao/UserDAO.java

src/main/java/com/example/demo/dto/MemberDto.java

src/main/java/com/example/demo/dto/UserDTO.java

src/main/java/com/example/demo/entity/Item.java

...main/java/com/example/demo/repository/ItemRepository.java

...in/java/com/example/demo/repository/MemberRepository.java

src/main/java/com/example/demo/service/MemberService.java

src/main/resources/application.properties

src/main/resources/mapper/UserMapper.xml

src/main/resources/static/index.html

src/main/resources/static/product.html

src/main/resources/static/productList.html

.../java/com/example/demo/repository/ItemRepositoryTest.java