fix conflict

functional_tests.py

@@ -74,6 +74,8 @@ class NewVisitorTest(unittest.TestCase):
             self.assertIn('sibuk tapi santai',comment)
         else:
             self.assertIn('oh tidak',comment)
+        self.check_for_row_in_list_table('1: Buy peacock feathers')
+        self.check_for_row_in_list_table('2: Use peacock feathers to make a fly')
 
 if __name__ == '__main__':  
     unittest.main(warnings='ignore')
\ No newline at end of file

lists/templates/home.html

@@ -13,7 +13,10 @@
         		<tr><td>{{ forloop.counter }}: {{ item.text }}</td></tr>
     		{% endfor %}
 		</table>
+<<<<<<< HEAD
 
 		<h2 id="comment">{{comment}}</h2>
+=======
+>>>>>>> c179133ab5bbcea398e11f36d4d4a6a1a65491c9
 	</body>
 </html>
\ No newline at end of file