auto updated documentation

DavertMik · DavertMik · commit f81e707b0f8b · 2019-09-11T11:48:01.000+03:00
diff --git a/docs/03-AcceptanceTests.md b/docs/03-AcceptanceTests.md
@@ -792,15 +792,9 @@ Additional debugging features by Codeception:
 
 ### Common Cases
 
-<<<<<<< HEAD
 Let's see how common problems of acceptance testing can be solved with Codeception.
 
-#### Authorization
-=======
-Let's see how common problems of acceptance testing can be solved with Codeception. We will need to update actor class (whcih is AcceptanceTester) in our case to add a new action.
-
 #### Login
->>>>>>> 82997221b762bc09876379f9f30906c9d364a4f5
 
 It is recommended to put widely used actions inside an Actor class. A good example is the `login` action
 which would probably be actively involved in acceptance or functional testing:
diff --git a/docs/09-Data.md b/docs/09-Data.md
@@ -217,7 +217,7 @@ modules:
 
 {% endhighlight %}
 
-### DataMapper
+### Doctrine
 
 Doctrine is also a popular ORM, unlike some others it implements the DataMapper pattern and is not bound to any framework.
 The [Doctrine2](http://codeception.com/docs/modules/Doctrine2) module requires an `EntityManager` instance to work with.
