fix merge conflicts.

laravel/database/eloquent/model.php

@@ -385,6 +385,19 @@ abstract class Model {
 		return $result;
 	}
 
+	/**
+	 * Delete the model from the database.
+	 *
+	 * @return int
+	 */
+	public function delete()
+	{
+		if ($this->exists)
+		{
+			return $this->query()->where(static::$key, '=', $this->get_key())->delete();
+		}
+	}
+
 	/**
 	 * Set the update and creation timestamps on the model.
 	 *

laravel/database/eloquent/relationships/has_many_and_belongs_to.php

@@ -170,9 +170,7 @@ class Has_Many_And_Belongs_To extends Relationship {
 	 */
 	public function delete()
 	{
-		$id = $this->base->get_key();
-
-		return $this->joining_table()->where($this->foreign_key(), '=', $id)->delete();
+		return $this->pivot()->delete();
 	}
 
 	/**