diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py
index 44f25c3b..78172c74 100644
--- a/seminar/views/views_all.py
+++ b/seminar/views/views_all.py
@@ -245,13 +245,9 @@ def spravne_novinky(request):
 
 class TitulniStranaView(generic.ListView):
 	template_name='seminar/titulnistrana.html'
-<<<<<<< HEAD
-	queryset = Novinky.objects.order_by('-datum')[:2]
-=======
 
 	def get_queryset(self):
 		return spravne_novinky(self.request)[:5]
->>>>>>> data_migrations
 
 	def get_context_data(self, **kwargs):
 		context = super(TitulniStranaView, self).get_context_data(**kwargs)