diff --git a/src/main/java/zipdabang/server/service/serviceImpl/MemberServiceImpl.java b/src/main/java/zipdabang/server/service/serviceImpl/MemberServiceImpl.java
index ec9ce12..6e17d99 100644
--- a/src/main/java/zipdabang/server/service/serviceImpl/MemberServiceImpl.java
+++ b/src/main/java/zipdabang/server/service/serviceImpl/MemberServiceImpl.java
@@ -75,11 +75,8 @@ public class MemberServiceImpl implements MemberService {
     private final DeregisterRepository deregisterRepository;
     private final DeregisterReasonRepository deregisterReasonRepository;
     private final BlockedMemberRepository blockedMemberRepository;
-<<<<<<< HEAD
-=======
 
     private final FollowRepository followRepository;
->>>>>>> a5dc21e0132e8f3e84329ab4d71729bbff08fef8
 
     @Value("${paging.size}")
     private Integer pageSize;
diff --git a/src/main/java/zipdabang/server/web/controller/MemberRestController.java b/src/main/java/zipdabang/server/web/controller/MemberRestController.java
index 5b35d16..5bae2dc 100644
--- a/src/main/java/zipdabang/server/web/controller/MemberRestController.java
+++ b/src/main/java/zipdabang/server/web/controller/MemberRestController.java
@@ -24,10 +24,7 @@
 import zipdabang.server.base.Code;
 import zipdabang.server.base.ResponseDto;
 import zipdabang.server.base.exception.handler.MemberException;
-<<<<<<< HEAD
 import zipdabang.server.base.exception.handler.RecipeException;
-=======
->>>>>>> a5dc21e0132e8f3e84329ab4d71729bbff08fef8
 import zipdabang.server.converter.MemberConverter;
 import zipdabang.server.domain.Category;
 import zipdabang.server.domain.member.Follow;
@@ -416,7 +413,7 @@ else if (page < 1)
         Page<Member> blockedMembers = memberService.findBlockedMember(page, member);
         return ResponseDto.of(MemberConverter.toPagingMemberListDto(blockedMembers));
     }
-}
+
 
 
     @Operation(summary = "🎪팔로우하기 API", description = "팔로우하기 API 입니다.")