Resolved Merge Conflicts

Author: MohammadIqbalAD

src/main/java/com/answerdigital/answerking/mapper/CategoryMapper.java

@@ -15,8 +15,6 @@
 @Mapper(componentModel = "spring",
         imports = {DateTimeFormatter.class, ZoneOffset.class, ZonedDateTime.class, ChronoUnit.class, Collectors.class})
 public interface CategoryMapper {
-    Category updateRequestToCategory(@MappingTarget Category category, RequestModelsCategory updateCategoryRequest);
-
     @Mapping(target = "createdOn", expression = "java( ZonedDateTime.now(ZoneOffset.UTC)" +
                                                     ".truncatedTo( ChronoUnit.SECONDS )" +
                                                     ".format( DateTimeFormatter.ofPattern( \"yyyy-MM-dd HH:mm:ss\" ) ) )")

src/main/java/com/answerdigital/answerking/model/Category.java

@@ -70,6 +70,7 @@ public Category(final RequestModelsCategory categoryRequest) {
         this.description = categoryRequest.description();
         this.retired = false;
     }
+
     public Category(final String name, final String description) {
         this.name = name;
         this.description = description;

src/main/java/com/answerdigital/answerking/model/Product.java

@@ -66,6 +66,7 @@ public Product(final RequestModelsProduct productRequest){
         this.price = productRequest.price();
         this.retired = false;
     }
+
     public Product(final String name, final String description, final BigDecimal price, final boolean isRetired) {
         this.name = name;
         this.description = description;