merge

-<<<<<<< HEAD
 <?php
 <?php
 use Action\WebAction;
 use Action\WebAction;
 class IndexController extends WebAction
 class IndexController extends WebAction
@@ -8,15 +7,4 @@ class IndexController extends WebAction
         echo 'hello';
         echo 'hello';
         exit();
         exit();
     }
     }
-=======
-<?php
-use Action\WebAction;
-class IndexController extends WebAction
-{
-    public function indexAction()
-    {
-        echo 'hello';
-        exit();
-    }
->>>>>>> 687eb8491b398c6ab714411b3c1bc0cf3c4ccbe8
 }
 }