diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index 3ff0aea..4d1f824 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -26,8 +26,12 @@ class AppTest{
 		$this->pluginsApi = plugin_api::getInstance();
 		$this->errorClass = new errorManagement($this);
 		$this->output = array();
+<<<<<<< HEAD
 <<<<<<< HEAD
 		$this->errorClass = new errorManagement($this);
+=======
+		$this->postParams = $_POST;
+>>>>>>> develop
 =======
 		$this->postParams = $_POST;
 >>>>>>> develop
@@ -105,6 +109,7 @@ class AppTest{
 		return json_encode($this->output);
 	}
 	
+<<<<<<< HEAD
 <<<<<<< HEAD
 	public function getErrorInstance(){
 		
@@ -115,3 +120,6 @@ class AppTest{
 =======
 }
 >>>>>>> develop
+=======
+}
+>>>>>>> develop