# Conflicts: # serviceapi/imageapi/src/main/java/com/founder/imageapi/ImageApiApplication.java # serviceapi/imageapi/src/main/java/com/founder/imageapi/controller/ImageController.java