fixed merge conflicts.

laravel/database/eloquent/model.php

@@ -202,23 +202,23 @@ abstract class Model {
 	}
 
 	/**
-	 * Get the first model result
+	 * Get an array of models from the database.
 	 *
-	 * @return mixed
+	 * @return array
 	 */
-	private function _first()
+	private function _get()
 	{
-		return (count($results = $this->take(1)->_get()) > 0) ? reset($results) : null;
+		return Hydrator::hydrate($this);
 	}
 
 	/**
-	 * Get an array of models from the database.
+	 * Get the first model result
 	 *
-	 * @return array
+	 * @return mixed
 	 */
-	private function _get()
+	private function _first()
 	{
-		return Hydrator::hydrate($this);
+		return (count($results = $this->take(1)->_get()) > 0) ? reset($results) : null;
 	}
 
 	/**

public/index.php

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