diff --git a/islandora.module b/islandora.module
index 12797e2a..70c51598 100644
--- a/islandora.module
+++ b/islandora.module
@@ -270,13 +270,6 @@ function islandora_permission() {
       'title' => t('View repository objects'),
       'description' => t('View objects in the repository. Note: Fedora XACML security policies may override this permission.'),
     ),
-<<<<<<< HEAD
-=======
-    FEDORA_MANAGE_DATASTREAMS => array(
-      'title' => t('Manage repository object datastreams'),
-      'description' => t('Manage datastreams of objects in the repository. Note: Fedora XACML security policies may override this permission.'),
-    ),
->>>>>>> e3ca25cd3329b4a1c7025947a5d88dadeb36b9e8
     FEDORA_ADD_DS => array(
       'title' => t('Add datastreams to repository objects'),
       'description' => t('Add datastreams to objects in the repository. Note: Fedora XACML security policies may override this position.'),