diff --git a/www/application/config/database.php b/www/application/config/database.php
index c5a77b4..559a9f3 100755
--- a/www/application/config/database.php
+++ b/www/application/config/database.php
@@ -78,10 +78,10 @@ $query_builder = TRUE;
 
 $db['default'] = array(
 	'dsn'	=> '',
-	'hostname' => 'external-db.s161944.gridserver.com',
-	'username' => 'db161944_web3_17',
-	'password' => 'f8-N8r*qY*m',
-	'database' => 'db161944_shs12010',
+	'hostname' => 'database',
+	'username' => 'lamp',
+	'password' => 'lamp',
+	'database' => 'lamp',
 	'dbdriver' => 'mysqli',
 	'dbprefix' => '',
 	'pconnect' => FALSE,
diff --git a/www/application/controllers/Register.php b/www/application/controllers/Register.php
index 9d175d3..cd3e6e7 100644
--- a/www/application/controllers/Register.php
+++ b/www/application/controllers/Register.php
@@ -47,8 +47,6 @@ class Register extends CI_Controller {
 
         //$this->load->view('login', $data);
         redirect('/All_Tweets');
-        $this->load->view('templates/header');
-        $this->load->view('register', $data);
       }
       // if no, refresh register
       else {
diff --git a/www/application/views/home.php b/www/application/views/home.php
index 94f2ecb..42b675a 100644
--- a/www/application/views/home.php
+++ b/www/application/views/home.php
@@ -11,20 +11,12 @@ error_reporting(0);
 	<h1>My Feed</h1>
 
 	<?php $this->load->library('form_validation'); ?>
-<<<<<<< HEAD
 	<form class="form" action="<?php echo base_url("index.php/All_Tweets/search_keyword")?>" method="post">
 		<div class="form-group">
 			<input type="text" name="keyword" class="form-control" placeholder="What would you like to find?">
 		</div>
 		<button class="btn btn-primary" type="submit" value="Search">Search</button>
-=======
-	<form class="form" action="/index.php/all_tweets/search_keyword" method="post">
-			<div class="form-group">
-				<input type="text" name="keyword" class="form-control" placeholder="What would you like to find?">
-			</div>
-			<button class="btn btn-primary" type="submit" value="Search">Search</button>
->>>>>>> ff101aa7b4d26d0ed0f4e7d3a4ef10af3337aabc
-	</form>
+
 	<!-- DISPLAY ERROR IF NO SEARCH RESULTS FOUND -->
 	<?php
 		if($results === []){ ?>
diff --git a/www/application/views/register.php b/www/application/views/register.php
index 09ac67b..ff09398 100644
--- a/www/application/views/register.php
+++ b/www/application/views/register.php
@@ -4,7 +4,6 @@
   <div class="login register container">
     <img class="icon reg" src="<?php echo base_url("img/twitter.png")?>" alt="Twitter">
     <h1>Register</h1>
-    <?php echo gettype($user); ?>
     <div class="form-group">
         <label for="firstname">First Name</label>
         <input class="form-control" type="text" name="firstname" value="<?php echo set_value('firstname'); ?>"/>