fix conflicts

src/Illuminate/Mail/Mailer.php

@@ -148,8 +148,6 @@ public function plain($view, array $data, $callback)
      */
     public function send($view, array $data, $callback)
     {
-        $this->forceReconnection();
-
         // First we need to parse the view, which could either be a string or an array
         // containing both an HTML and plain text versions of the view which should
         // be used when sending an e-mail. We will extract both of them out here.
@@ -383,7 +381,11 @@ protected function sendSwiftMessage($message)
             $this->events->fire(new Events\MessageSending($message));
         }
 
-        return $this->swift->send($message, $this->failedRecipients);
+        try {
+            return $this->swift->send($message, $this->failedRecipients);
+        } finally {
+            $this->swift->getTransport()->stop();
+        }
     }
 
     /**