diff --git a/src/kszkepzes/settings.py b/src/kszkepzes/settings.py
index 2191c8b83ec28ecbcdcb419b0cc126f19ab577bf..ea5176c18a55603ac44c5c6f8ada448023d9daef 100644
--- a/src/kszkepzes/settings.py
+++ b/src/kszkepzes/settings.py
@@ -39,12 +39,9 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django_extensions',
     'rest_framework',
-<<<<<<< HEAD
     'stats'
-=======
     'social_django',
     'authsch',
->>>>>>> f31ae04982515a54fa3ce667ce7f5b6aeaf87c00
 ]
 
 MIDDLEWARE = [
diff --git a/src/stats/admin.py b/src/stats/admin.py
index 9216300cfae11f4635d1faeebc3aabe1f3225ae8..31d1790e269f151282692e54d64d504eb5af0cb7 100644
--- a/src/stats/admin.py
+++ b/src/stats/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
-from .models import Profile, Kszk_training
+from .models import Profile, Event
 
 admin.site.register(Profile)
-admin.site.register(Kszk_training)
+admin.site.register(Event)
 # Register your models here.