diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c
index 9662b54d92..cadbe67ed6 100644
--- a/src/libostree/ostree-sysroot.c
+++ b/src/libostree/ostree-sysroot.c
@@ -2243,9 +2243,6 @@ ostree_sysroot_deployment_unlock (OstreeSysroot *self, OstreeDeployment *deploym
                         deployment, _OSTREE_SYSROOT_DEPLOYMENT_RUNSTATE_FLAG_DEVELOPMENT)
                   : _ostree_sysroot_get_runstate_path (
                         deployment, _OSTREE_SYSROOT_DEPLOYMENT_RUNSTATE_FLAG_TRANSIENT);
-<<<<<<< HEAD
-        g_autofree char *devpath_parent = g_path_get_dirname (devpath);
-=======
         
         g_autofree char *devpath_parent = "";
         if (devpath[strlen (devpath) - 1] == G_DIR_SEPARATOR)
@@ -2256,7 +2253,6 @@ ostree_sysroot_deployment_unlock (OstreeSysroot *self, OstreeDeployment *deploym
           }
         else
           devpath_parent = g_path_get_dirname (devpath);
->>>>>>> 550be593 (wip)
 
         if (!glnx_shutil_mkdir_p_at (AT_FDCWD, devpath_parent, 0755, cancellable, error))
           return FALSE;