diff --git a/python/sciebo_shares.py b/python/sciebo_shares.py
old mode 100644
new mode 100755
index 5bc1fc5..60edac3
--- a/python/sciebo_shares.py
+++ b/python/sciebo_shares.py
@@ -200,6 +200,7 @@ if __name__ == "__main__":
         else:
             command = 'list'
     
+<<<<<<< HEAD
         if   command == 'add':
             add_shares(options, oc, shares)
         elif command == 'list':
@@ -208,4 +209,13 @@ if __name__ == "__main__":
             check_shares(options, oc, shares)
         
     except owncloud.ResponseError as e:
-        print 'OwnCloud: %s' % e.response.content.strip()
\ No newline at end of file
+        print 'OwnCloud: %s' % e.response.content.strip()
+=======
+    if   command == 'add':
+        add_shares(oc, shares)
+    elif command == 'list':
+        admin = (len(sys.argv) == 3) and (sys.argv[2] == 'admin')
+        list_shares(oc, shares, admin)
+    elif command == 'check':
+        check_shares(oc, shares)
+>>>>>>> c849a33e2d76a4349136ab874b977599786789e2