diff --git a/meson.build b/meson.build
index 61654cf2a..d457b9d1d 100644
--- a/meson.build
+++ b/meson.build
@@ -69,15 +69,9 @@ else
 endif
 
 atk_bridge_dep = dependency('atk-bridge-2.0')
-<<<<<<< HEAD
-ecal_dep = dependency('libecal-2.0', version: ecal_req)
-eds_dep = dependency('libedataserver-1.2', version: eds_req)
-gcr_dep = dependency('gcr-4', version: gcr_req)
-=======
 #ecal_dep = dependency('libecal-2.0', version: ecal_req)
 #eds_dep = dependency('libedataserver-1.2', version: eds_req)
-gcr_dep = dependency('gcr-base-3', version: gcr_req)
->>>>>>> 9cbbbab03 (Citadel changes to gnome-shell)
+gcr_dep = dependency('gcr-4', version: gcr_req)
 gdk_x11_dep = dependency('gdk-x11-3.0')
 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0')
 gi_dep = dependency('gobject-introspection-1.0', version: gi_req)