diff --git a/appinfo/info.xml b/appinfo/info.xml
index 478e298727751d56ea57c70a237b2c54020ff55c..15e0f75700e01de5c9b0a3c0abcfda1c37e3e071 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -15,7 +15,11 @@
 * ☑️ Tasks! See tasks with a due date directly in the calendar
 * 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.
 	]]></description>
+<<<<<<< HEAD
 	<version>3.4.0-alpha.1</version>
+=======
+	<version>3.2.4</version>
+>>>>>>> ec6343eb80c41e1d86450b931d2dfdbee54baab5
 	<licence>agpl</licence>
 	<author>Anna Larch</author>
 	<author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author>