diff --git a/app/views/admin/events/new.html.haml b/app/views/admin/events/new.html.haml
index 94e570f04..4dca33846 100644
--- a/app/views/admin/events/new.html.haml
+++ b/app/views/admin/events/new.html.haml
@@ -1,16 +1,3 @@
-<<<<<<< HEAD
 = form_for(@event, url: @url) do |f|
   = render 'proposals/form', f: f
   = render 'shared/user_selectize'
-=======
-.row
-  .col-md-12
-    .page-header
-      %h1
-        New Event
-.row
-  .col-md-8
-    = form_for(@event, url: @url) do |f|
-      = render partial: 'proposals/form', locals: { f: f }
-    = render partial: 'shared/user_selectize'
->>>>>>> opensuse/master
diff --git a/app/views/admin/users/edit.html.haml b/app/views/admin/users/edit.html.haml
index bf6f60721..729927996 100644
--- a/app/views/admin/users/edit.html.haml
+++ b/app/views/admin/users/edit.html.haml
@@ -1,11 +1 @@
-<<<<<<< HEAD
-.row
-  .col-md-12
-    .page-header
-      %h1
-        Edit User #{@user.nickname}
-    = form_for(@user) do |f|
-      = render 'users/form', f: f
-=======
 = render partial: 'form'
->>>>>>> opensuse/master