diff --git a/src/components/Collection/Collection.tsx b/src/components/Collection/Collection.tsx
index 3efabe6..1b6b868 100644
--- a/src/components/Collection/Collection.tsx
+++ b/src/components/Collection/Collection.tsx
@@ -31,19 +31,9 @@ export const Collection = (props: Props) => {
const pageNumber: string = page.toString() || '1';
const renderList = (data: StoryModel[], perPage: number) => {
-<<<<<<< HEAD
- let classNames = "collection content";
- if (isFetching) {
- classNames = `${classNames} is-fetching`;
- }
- return (
-
-
-=======
return (
->>>>>>> feat/dark-mode
{renderStories(data, perPage)}
@@ -74,19 +64,12 @@ export const Collection = (props: Props) => {
return (
{renderList(content, content.length)}
-<<<<<<< HEAD
-
-=======
->>>>>>> feat/dark-mode
);
}
@@ -104,11 +87,7 @@ export const Collection = (props: Props) => {
}
return (
-<<<<<<< HEAD
-
-=======
->>>>>>> feat/dark-mode
{renderContent(collection)}
);
diff --git a/src/components/Comment/Comment.tsx b/src/components/Comment/Comment.tsx
index 8fd93ba..8e33c07 100644
--- a/src/components/Comment/Comment.tsx
+++ b/src/components/Comment/Comment.tsx
@@ -33,10 +33,6 @@ export const Comment = (props: ICommentProps): JSX.Element => {
dangerouslySetInnerHTML={renderMarkup(comment.content)}
/>
-<<<<<<< HEAD
-
-=======
->>>>>>> feat/dark-mode
{comment.comments.length > 0
?
: ''
diff --git a/src/components/Item/Item.tsx b/src/components/Item/Item.tsx
index 7043e15..11951e6 100644
--- a/src/components/Item/Item.tsx
+++ b/src/components/Item/Item.tsx
@@ -50,11 +50,7 @@ export const Item = (props: Props) => {
}
>>>>>> feat/dark-mode
dangerouslySetInnerHTML={renderMarkup(data.content)}
/>