diff --git a/clokey-api/src/main/java/org/clokey/domain/like/repository/MemberLikeRepository.java b/clokey-api/src/main/java/org/clokey/domain/like/repository/MemberLikeRepository.java
index 76ec5b67..b96c90da 100644
--- a/clokey-api/src/main/java/org/clokey/domain/like/repository/MemberLikeRepository.java
+++ b/clokey-api/src/main/java/org/clokey/domain/like/repository/MemberLikeRepository.java
@@ -9,11 +9,8 @@
 
 public interface MemberLikeRepository extends JpaRepository<MemberLike, Long> {
 
-<<<<<<< HEAD
-=======
     long countByHistoryId(Long historyId);
 
->>>>>>> 707263d5afbbd10030259d946f7748710380a71c
     @Query(
             """
         SELECT ml
@@ -24,8 +21,6 @@ public interface MemberLikeRepository extends JpaRepository<MemberLike, Long> {
         """)
     List<MemberLike> findLikedHistoriesByMemberId(
             Long memberId, Long lastLikeId, Pageable pageable);
-<<<<<<< HEAD
-=======
 
     @Query(
             """
@@ -38,5 +33,4 @@ List<MemberLike> findLikedHistoriesByMemberId(
     List<MemberLike> findLikeMembersByHistoryId(Long historyId, Long lastLikeId, Pageable pageable);
 
     Optional<MemberLike> findByMemberIdAndHistoryId(Long memberId, Long historyId);
->>>>>>> 707263d5afbbd10030259d946f7748710380a71c
 }