Fix conflict

diff --cc lib/server.php
index b09d380b0e962e70987b7b45614b014d9b3ead88,e97bc296ca0bb78e3f6197ea77cab5f71ec29713..f3c79aa797f501b6ba8751e8e907880dac83cd64
--- 1/lib/server.php
--- 2/lib/server.php
+++ b/lib/server.php
@@@ -49,15 -49,15 +49,16 @@@ class Server extends SimpleContainer im
                $this->registerService('PreviewManager', function($c) {
                        return new PreviewManager();
                });
-               $this->registerService('TagManager', function($c){
-                       return new Tags();
+               $this->registerService('TagManager', function($c) {
 -                      // TODO: get user and user manager from container as well
+                       $user = \OC_User::getUser();
+                       return new Tags($user);
                });
-               $this->registerService('RootFolder', function($c){
+               $this->registerService('RootFolder', function($c) {
                        // TODO: get user and user manager from container as well
                        $user = \OC_User::getUser();
 -                      $user = \OC_User::getManager()->get($user);
 +                      /** @var $c SimpleContainer */
 +                      $userManager = $c->query('UserManager');
 +                      $user = $userManager->get($user);
                        $manager = \OC\Files\Filesystem::getMountManager();
                        $view = new View();
                        return new Root($manager, $view, $user);