Fix code format

Author: damianmalczewski

problem4j-spring-webflux/src/main/java/io/github/problem4j/spring/webflux/autoconfigure/ProblemWebFluxProperties.java

@@ -347,12 +347,8 @@ private static ErrorWebExceptionHandler createDefault() {
      *
      * @param enabled whether the {@code ErrorWebExceptionHandler} should be replaced with {@code
      *     ProblemErrorWebExceptionHandler}
-<<<<<<< HEAD
-     * @see org.springframework.boot.webflux.error.ErrorWebExceptionHandler
-=======
->>>>>>> release-v1.2.x
      * @see io.github.problem4j.spring.webflux.ProblemErrorWebExceptionHandler
-     * @see org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler
+     * @see org.springframework.boot.webflux.error.ErrorWebExceptionHandler
      */
     public ErrorWebExceptionHandler(@DefaultValue(DEFAULT_ENABLED_VALUE) boolean enabled) {
       this.enabled = enabled;