Cleaning up the mess.

_services section was faulty and didn't show on home page

pages/01.home/_donatebutton/fullbar.de.md

@@ -1,5 +1,5 @@
 ---
-title: 'Spende button'
+title: Donate button
 bgcolor: '#f2f2f2'
 fontcolor: '#FFF'
 text_align: center

pages/01.home/_services/services.de.md

@@ -73,17 +73,11 @@ services:
         title: Umfragen
         icon: polls.png
         link: 'https://disroot.org/services/polls'
-<<<<<<< HEAD
-        text: "Online service for planning an appointment or making decisions quickly and easily."
-        button: 'https://poll.disroot.org'
-        buttontext: "Start a poll"
-=======
         text: "Onlinedienst zur Abstimmung von Terminen oder um schnell eine gemeinsame Entscheidung zu treffen."
-        button: 'https://polls.disroot.org'
+        button: 'https://poll.disroot.org'
         buttontext: "Umfrage starten"
->>>>>>> master
     -
-        title: 'Projekt-Board'
+        title: Projekt-Board
         icon: project_board.png
         link: 'https://disroot.org/services/project-board'
         text: "Ein Werkzeug zur Projektverwaltung im Kanban-Stil."