Fix merge conflicts

.gitignore

build.gradle

src/main/java/umc/spring/file/config/AwsConfig.java

src/main/java/umc/spring/file/controller/FileController.java

src/main/java/umc/spring/file/domain/S3FileDto.java

src/main/java/umc/spring/file/service/AmazonS3Service.java

src/main/java/umc/spring/file/service/S3Service.java

src/main/resources/application-aws.properties

src/main/resources/application.properties