resolved conflicts

src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java

@@ -61,4 +61,5 @@ public class QRCodeTypeController {
     public ResponseEntity<RedirectCountResponse> checkRedirects(@RequestBody QRCodePayload payload) {
         return ResponseEntity.ok(redirectCountService.countRedirects(payload).block());
     }
+
 }

src/test/java/com/safeqr/app/SafeQrAppApplicationTests.java

@@ -4,9 +4,9 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-public class SafeQrAppApplicationTests {
+class SafeQrAppApplicationTests {
 
 	@Test
-	public void contextLoads() {
+	void contextLoads() {
 	}
 }