fixed merge conflicts.

laravel/database/eloquent/model.php

@@ -201,16 +201,6 @@ abstract class Model {
 		return static::query(get_called_class())->where('id', '=', $id)->first();
 	}
 
-	/**
-	 * Get the first model result
-	 *
-	 * @return mixed
-	 */
-	private function _first()
-	{
-		return (count($results = $this->take(1)->_get()) > 0) ? reset($results) : null;
-	}
-
 	/**
 	 * Get an array of models from the database.
 	 *
@@ -221,6 +211,16 @@ abstract class Model {
 		return Hydrator::hydrate($this);
 	}
 
+	/**
+	 * Get the first model result
+	 *
+	 * @return mixed
+	 */
+	private function _first()
+	{
+		return (count($results = $this->take(1)->_get()) > 0) ? reset($results) : null;
+	}
+
 	/**
 	 * Retrieve the query for a 1:1 relationship.
 	 *

public/index.php

@@ -48,4 +48,4 @@ $public      = __DIR__;
 | 3... 2... 1... Lift-off!
 |--------------------------------------------------------------------------
 */
-require $laravel.'/laravel.php';
+require $laravel.'/laravel.php';