diff --git a/app/templates/film.html b/app/templates/film.html
index 6bbff24..dcf99a5 100755
--- a/app/templates/film.html
+++ b/app/templates/film.html
@@ -17,7 +17,6 @@ body {
 
 <div class="film">
 	<div class="info">
-<<<<<<< HEAD
 		<div class="info-meta">
 			<h1>
 				<span class="font-bold">{{ film.data.title | safe }}</span>
@@ -29,38 +28,17 @@ body {
 				{% endfor %}
 			</h2>
 			<div class="details">
-				Year: {{ film.data.date}}, Runtime: {{ film.duration }}
-=======
-		<h1>
-			<span>{{ film.data.title | safe }}</span>
-			<span>{{ film.data.title_zh | safe }}</span>
-		</h1>
-		<h2>
-			{% for director in film.data.director %}
-			{{ director|safe }}<br>
-			{% endfor %}
-		</h2>
-		<div class="details">
-			{{ film.data.date }}, {{ film.duration }}
-		</div>
-		<video src="{{ settings.TIMELINE_PREFIX }}{{ film.padma_id }}/loop.mp4" autoplay loop muted></video>
-		<p>{{ film.data.summary|safe }}</p>
-		<br>
-		<p>{{ film.data.summary_zh|safe }}</p>
-		<div class="bio">
-			<div class="en">
-				{{film.data.director.0}}: {{ film.data.bio|safe }}
-			</div>
-			<div class="zh">
-				{{film.data.director.1}}: {{ film.data.bio_zh|safe }}
->>>>>>> main
-			</div>
+				{{ film.data.date}}, {{ film.duration }}
+            </div>
+				
 		</div>	
 		<div class="video-block">			
 			<video src="{{ settings.TIMELINE_PREFIX }}{{ film.padma_id }}/loop.mp4" autoplay loop muted></video>
 		</div>
 		<div class="bio-block">
 			<p>{{ film.data.summary|safe }}</p>
+                <br>
+            <p>{{ film.data.summary_zh|safe }}</p>
 			<div class="bio">
 				<div class="en">
 					{{film.data.director.0}}: {{ film.data.bio|safe }}