Fixes some typos/merge conflict errors

src/main/java/com/nisum/ascend/promotions/exception/RestWebExceptionHandler.java

@@ -25,16 +25,6 @@ class RestWebExceptionHandler implements WebExceptionHandler {
             // marks the response as complete and forbids writing to it
             return exchange.getResponse().writeWith(Flux.just(buffer));
         }
-        return Mono.error(ex);
-    }
-}
-
-
-@Component
-@Order(-2)
- class RestWebExceptionHandler implements WebExceptionHandler {
-    @Override
-    public Mono<Void> handle(ServerWebExchange exchange, Throwable ex) {
         if (ex instanceof PromotionAlreadyExistsException) {
             exchange.getResponse().setStatusCode(HttpStatus.NOT_ACCEPTABLE);
 
@@ -42,5 +32,4 @@ class RestWebExceptionHandler implements WebExceptionHandler {
         }
         return Mono.error(ex);
     }
-
 }

src/test/java/com/nisum/ascend/promotions/controller/PromotionsControllerTest.java

 package com.nisum.ascend.promotions.controller;
 
 import com.nisum.ascend.promotions.dto.PromotionDto;
+import com.nisum.ascend.promotions.model.Promotion;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -62,7 +63,9 @@ class PromotionsControllerTest {
                 .expectHeader().contentType(MediaType.APPLICATION_JSON_VALUE)
                 .expectBody()
                 .jsonPath("promotionId", "0003");
+    }
 
+    @Test
     void createPromotion(){
         Promotion promotion = new Promotion("50OFF","SH1234", (float) 0.5,5);
         webTestClient.post().uri("/api/promos")