diff --git a/Apollo/api/application/config/database.php b/Apollo/api/application/config/database.php
index 20ed4d6f..f8df5be8 100755
--- a/Apollo/api/application/config/database.php
+++ b/Apollo/api/application/config/database.php
@@ -75,20 +75,10 @@ $query_builder = TRUE;
 
 $db['default'] = array(
 	'dsn'	=> '',
-<<<<<<< HEAD
-	// 'hostname' => 'apollodec.com',
-	//  'username' => 'apollod4_SIT',
-	//  'password' => 'apollosit1234',
-	//  'database' => 'apollod4_ApolloDECNEWSIT',
-=======
 	'hostname' => 'apollodec.com',
-//	 'username' => 'apollod4_SIT',
-//	 'password' => 'apollosit1234',
-//	 'database' => 'apollod4_ApolloDECNEWSIT',
->>>>>>> 3f287c92a22bb6528c89be19aabcde2ec3393f70
-	 'username' => 'apollod4_DEV',
-	 'password' => 'apollo1234',
-	 'database' => 'apollod4_ApolloDECDev',
+	'username' => 'apollod4_DEV',
+	'password' => 'apollo1234',
+	'database' => 'apollod4_ApolloDECDev',
 	'dbdriver' => 'mysqli',
 	'dbprefix' => '',
 	'pconnect' => FALSE,