diff --git a/erpnext/www/lms/course.html b/erpnext/www/lms/course.html
index 9896b01..bd2d6b8 100644
--- a/erpnext/www/lms/course.html
+++ b/erpnext/www/lms/course.html
@@ -1,6 +1,7 @@
 {% extends "frappe_theme/templates/base.html" %}
 {% block title %}ERPNext Academy{% endblock %}
 {% from "templates/includes/media.html" import media %}
+<<<<<<< HEAD
 {% block head_include %}
 <meta name="description" content="ERPNext Academy is a learnig platform to gain expertise in the world's top 100% open source ERP software." />
 <meta name="keywords" content="ERP Software, Cloud ERP, Open Source ERP, Accounting Software, Online ERP, Online Accounting, ERP for small business, Learn ERP, ERPNext Academy, Learn ERPNext, Learn Accounting" />
@@ -10,6 +11,11 @@
     {% with content = current_content, next_content = next_content, course_name = course_name, program_name = program_name %}
     {% include "www/lms/templates/includes/" + content_type.lower() + ".html" %}
     {% endwith %}
+=======
+{% block content %}
+<div id="content-holder" data-type="{{ content_type }}" data-content="{{ current_content.name }}" data-course="{{ course_name }}" data-program="{{ program_name }}">
+{% include "www/lms/templates/includes/" + content_type.lower() + ".html" %}
+>>>>>>> LMS: Fixed views for article and video
 </div>
 <style>
 .footer-message {
diff --git a/erpnext/www/lms/program.html b/erpnext/www/lms/program.html
index 00e13cb..ba21e4c 100644
--- a/erpnext/www/lms/program.html
+++ b/erpnext/www/lms/program.html
@@ -1,11 +1,6 @@
 {% extends "frappe_theme/templates/base.html" %}
 {% block title %}ERPNext Academy{% endblock %}
 
-{% block head_include %}
-<meta name="description" content="ERPNext Academy is a learnig platform to gain expertise in the world's top 100% open source ERP software." />
-<meta name="keywords" content="ERP Software, Cloud ERP, Open Source ERP, Accounting Software, Online ERP, Online Accounting, ERP for small business, Learn ERP, ERPNext Academy, Learn ERPNext, Learn Accounting" />
-{% endblock %}
-
 {% macro course_card(course) %}
 <div class="card mt-3" data-list="getting-started">
     <div class='card-body'>
diff --git a/erpnext/www/lms/templates/includes/article.html b/erpnext/www/lms/templates/includes/article.html
index 15835b8..487a4c5 100644
--- a/erpnext/www/lms/templates/includes/article.html
+++ b/erpnext/www/lms/templates/includes/article.html
@@ -2,6 +2,7 @@
         <div class='container'>
             <div class="row">
                 <div class="col-md-8">
+<<<<<<< HEAD
                     <h2>{{ content.title }}</h2>
                     <span class="text-muted">
                         Published on {{ content.publish_date }}, by {{ content.author }}
@@ -11,6 +12,15 @@
                     {% with next_content = next_content, course_name = course_name, program_name = program_name %}
                         {% include "www/lms/templates/includes/lms-nav.html" %}
                     {% endwith %}
+=======
+                    <h2>{{ current_content.title }}</h2>
+                    <span class="text-muted">
+                        Published on {{ current_content.publish_date }}, by {{ current_content.author }}
+                    </span>
+                </div>
+                <div class="col-md-4 text-right">
+                    {% include "www/lms/templates/includes/lms-nav.html" %}
+>>>>>>> LMS: Fixed views for article and video
                 </div>
             </div>
             <hr>
@@ -19,12 +29,19 @@
     <section class="article-content-section">
         <div class='container'>
             <div class="content">
+<<<<<<< HEAD
                 {{ content.content }}
             </div>
             <div class="text-right">
                     {% with next_content = next_content, course_name = course_name, program_name = program_name %}
                         {% include "www/lms/templates/includes/lms-nav.html" %}
                     {% endwith %}
+=======
+                {{ current_content.content }}
+            </div>
+            <div class="text-right">
+                {% include "www/lms/templates/includes/lms-nav.html" %}
+>>>>>>> LMS: Fixed views for article and video
             </div>
             <div class="mt-3 text-right">
                 <a class="text-muted" href="/report"><i class="octicon octicon-issue-opened" title="Report"></i> Report a
diff --git a/erpnext/www/lms/templates/includes/quiz.html b/erpnext/www/lms/templates/includes/quiz.html
index 8d20a26..a93bb16 100644
--- a/erpnext/www/lms/templates/includes/quiz.html
+++ b/erpnext/www/lms/templates/includes/quiz.html
@@ -41,12 +41,9 @@
                             <h3>Your Score: <span id="result"></span></h3>
                         </div>
                         <div class="col-md-4 text-right">
-                            <a class='btn btn-outline-secondary' href="#">Previous</a>
-                            {% if next_content != None %}
-                            <a class='btn btn-primary' href="/lms/course?program={{ program }}&course={{ course_name }}&content={{ next_content }}">Next</a>
-                            {% else %}
-                            <a class='btn btn-primary' href="/lms/program?program={{ program }}">Finish Course</a>
-                            {% endif %}
+                            {% with next_content = next_content, course_name = course_name, program_name = program_name %}
+                                {% include "www/lms/templates/includes/lms-nav.html" %}
+                            {% endwith %}
                         </div>
                     </div>
                 </div>
diff --git a/erpnext/www/lms/templates/includes/video.html b/erpnext/www/lms/templates/includes/video.html
index e3ddacb..4ab5659 100644
--- a/erpnext/www/lms/templates/includes/video.html
+++ b/erpnext/www/lms/templates/includes/video.html
@@ -1,18 +1,31 @@
 <section class='video-top-section video-section-bg'>
     <div class='container'>
         <div class="embed-responsive embed-responsive-16by9">
+<<<<<<< HEAD
             <iframe class="embed-responsive-item" src="https://www.youtube.com/embed/{{ content.url.split('v=')[1].split('&')[0] }}" allowfullscreen></iframe>
+=======
+            <iframe class="embed-responsive-item" src="https://www.youtube.com/embed/{{ current_content.url.split('v=')[1].split('&')[0] }}" allowfullscreen></iframe>
+>>>>>>> LMS: Fixed views for article and video
         </div>
         <div class="mt-3 row">
             <div class="col-md-8">
                 <h2>{{ content.name }}</h2>
                 <span class="text-muted">
+<<<<<<< HEAD
                     <i class="octicon octicon-clock" title="Duration"></i> {{ content.duration }} Mins
                     &mdash; Published on {{ content.publish_date }}.
                 </span>
             </div>
             <div class="col-md-4 text-right">
                 {% with next_content = next_content, course_name = course_name, program_name = program_name %}
+=======
+                    <i class="octicon octicon-clock" title="Duration"></i> {{ current_content.duration }} Mins
+                    &mdash; Published on {{ current_content.publish_date }}.
+                </span>
+            </div>
+            <div class="col-md-4 text-right">
+                {% with  %}
+>>>>>>> LMS: Fixed views for article and video
                     {% include "www/lms/templates/includes/lms-nav.html" %}
                 {% endwith %}
             </div>
@@ -23,7 +36,11 @@
 <section class="video-description-section">
     <div class='container'>
         <div class="content">
+<<<<<<< HEAD
             {{ content.description }}
+=======
+            {{ current_content.description }}
+>>>>>>> LMS: Fixed views for article and video
         </div>
         <div class="text-right hidden">
             <a class='btn btn-outline-secondary' href="/classrooms/module">Previous</a>