diff --git a/src/main/java/com/leets/xcellentbe/domain/article/dto/ArticlesResponseDto.java b/src/main/java/com/leets/xcellentbe/domain/article/dto/ArticlesResponseDto.java
index bd42783..7aeb154 100644
--- a/src/main/java/com/leets/xcellentbe/domain/article/dto/ArticlesResponseDto.java
+++ b/src/main/java/com/leets/xcellentbe/domain/article/dto/ArticlesResponseDto.java
@@ -35,9 +35,8 @@ public static ArticlesResponseDto of(Article article, List<String> filePath) {
 		return ArticlesResponseDto.builder()
 			.writer(article.getWriter().getUserName())
 			.content(article.getContent())
-			.isPinned(article.getIsPinned())
 			.hashtags(article.getHashtags())
-			.rePost(article.getReArticle())
+			.rePost(article.getRePost())
 			.filePath(filePath)
 			.build();
 	}
diff --git a/src/main/java/com/leets/xcellentbe/domain/comment/domain/Comment.java b/src/main/java/com/leets/xcellentbe/domain/comment/domain/Comment.java
index d7fbfba..e200613 100644
--- a/src/main/java/com/leets/xcellentbe/domain/comment/domain/Comment.java
+++ b/src/main/java/com/leets/xcellentbe/domain/comment/domain/Comment.java
@@ -40,11 +40,7 @@ public class Comment extends BaseTimeEntity {
 	@NotNull
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "post_id")
-<<<<<<< HEAD
-	private Article article;
-=======
 	private Article post;
->>>>>>> develop
 
 	@NotNull
 	@Column