diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index 4d7cab5..6685ec7 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -1,6 +1,15 @@
 <?php
 include_once("../core/Plugin_Api.php");
 include_once("../core/LibOverride/genTokenOptions.php");
+<<<<<<< Updated upstream
+=======
+include_once("../core/ErrorManagement.php");
+
+use OpenCloud\Common\Error\BadResponseError;
+use OpenCloud\Common\Error\BaseError;
+use OpenCloud\Common\Error\NotImplementedError;
+use OpenCloud\Common\Error\UserInputError;
+>>>>>>> Stashed changes
 
 class AppTest{
 	
diff --git a/server/composer.lock b/server/composer.lock
index c6598db..198bbed 100644
--- a/server/composer.lock
+++ b/server/composer.lock
@@ -71,16 +71,16 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.0.3",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea"
+                "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/b1e1c0d55f8083c71eda2c28c12a228d708294ea",
-                "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/bb9024c526b22f3fe6ae55a561fd70653d470aa8",
+                "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8",
                 "shasum": ""
             },
             "require": {
@@ -118,20 +118,20 @@
             "keywords": [
                 "promise"
             ],
-            "time": "2015-10-15 22:28:00"
+            "time": "2016-03-08 01:15:46"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.2.2",
+            "version": "1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb"
+                "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5d04bdd2881ac89abde1fb78cc234bce24327bb",
-                "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/2e89629ff057ebb49492ba08e6995d3a6a80021b",
+                "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b",
                 "shasum": ""
             },
             "require": {
@@ -176,7 +176,7 @@
                 "stream",
                 "uri"
             ],
-            "time": "2016-01-23 01:23:02"
+            "time": "2016-02-18 21:54:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -250,23 +250,25 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-opencloud/openstack.git",
-                "reference": "15aca73f423166c7ef8337ba08615c103c66e931"
+                "reference": "f2ee77024843659d970817a9e7055bb40a3724f9"
             },
             "dist": {
                 "type": "zip",
+<<<<<<< Updated upstream
                 "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/15aca73f423166c7ef8337ba08615c103c66e931",
                 "reference": "15aca73f423166c7ef8337ba08615c103c66e931",
+=======
+                "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/f2ee77024843659d970817a9e7055bb40a3724f9",
+                "reference": "f2ee77024843659d970817a9e7055bb40a3724f9",
+>>>>>>> Stashed changes
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/guzzle": "~6.1",
-                "justinrainbow/json-schema": "~1.3",
-                "php": ">=5.6"
+                "php-opencloud/common": "dev-master"
             },
             "require-dev": {
                 "fabpot/php-cs-fixer": "~1.0",
                 "jakub-onderka/php-parallel-lint": "0.*",
-                "phpspec/prophecy-phpunit": "~1.0",
                 "phpunit/phpunit": "~4.0",
                 "psr/log": "~1.0",
                 "sami/sami": "dev-master",
@@ -275,9 +277,7 @@
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "OpenStack\\": "src/",
-                    "OpenStack\\Test\\": "tests/unit/",
-                    "OpenStack\\Integration\\": "tests/integration/"
+                    "OpenStack\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -288,7 +288,7 @@
                     "homepage": "https://github.com/jamiehannaford"
                 }
             ],
-            "time": "2016-01-25 10:35:10"
+            "time": "2016-03-08 14:37:14"
         },
         {
             "name": "psr/http-message",