fix conflicts

Author: williamespindola

tests/unit/Repository/RepositoryAbstractTest.php

@@ -89,4 +89,4 @@ public function getStorage()
     {
         return $this->storage;
     }
-}
+}

tests/unit/Storage/ORM/RespectRelationalTest.php

@@ -59,6 +59,9 @@ public function testSetRepositoryWithInvalidValueShouldThrowAndException()
         $instance->setRepository('');
     }
 
+    /**
+     * @depends testSetRepositoryWithInvalidValueShouldThrowAndException
+     */
     public function testSetRepositoryWithAValidNamespaceShouldWork()
     {
         $instance   = new RespectRelational($this->mapper);
@@ -96,4 +99,4 @@ public function testGetRepositoryShouldReturnMockedInstance()
             'The attribute repository is not instance of the string class name: Respect\Data\Collections\Collection'
         );
     }
-} 
+}