# Conflicts: # src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java # src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java # src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryCustom.java # src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java