diff --git a/app/templates/app/katalog_materi.html b/app/templates/app/katalog_materi.html
index 53e11ee775321e09ea39edfca7500090966b8bcc..b788a696bc8c1747f2a2bb1c0921a222bb8e1536 100644
--- a/app/templates/app/katalog_materi.html
+++ b/app/templates/app/katalog_materi.html
@@ -41,28 +41,17 @@
<link rel="stylesheet" type="text/css" href="{% static 'css/main.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/navbar_katalog_materi.css' %}">
<!--===============================================================================================-->
-<<<<<<< HEAD
-
-
-{% endblock header %}
-{% block content %}
-=======
{% endblock header %}
{% block content %}
->>>>>>> 0a815a6d87c62d6e1ba35f5645c26ce81ef2dfdb
</head>
<body style="background-color: #f8f8f8;">
-<<<<<<< HEAD
{% include 'app/includes/navbar_katalog_materi.html' %}
<!-- Page Content -->
-=======
- <!-- Page Content -->
->>>>>>> 0a815a6d87c62d6e1ba35f5645c26ce81ef2dfdb
<div class="container">
<header class="jumbotron my-4">
<div class="container">
diff --git a/requirements.txt b/requirements.txt
index dd1dc36db7064f6733d1201a108b29a2e4c79a44..2dafe5770528b05be826fdee0bfcb31197252467 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -74,11 +74,8 @@ PyYAML==5.3.1
regex==2020.4.4
requests==2.23.0
rsa==4.0
-<<<<<<< HEAD
selenium==3.141.0
-=======
simplejson==3.7.3
->>>>>>> 0a815a6d87c62d6e1ba35f5645c26ce81ef2dfdb
six==1.14.0
soupsieve==2.0
sqlparse==0.3.1
@@ -91,9 +88,6 @@ wcwidth==0.1.9
webdriver-manager==3.2.2
whitenoise==5.0.1
wrapt==1.11.2
-<<<<<<< HEAD
-=======
xlrd==1.2.0
XlsxWriter==1.3.6
->>>>>>> 0a815a6d87c62d6e1ba35f5645c26ce81ef2dfdb
zipp==3.1.0