fix conflicts.

laravel/documentation/input.md

@@ -145,10 +145,10 @@ Sometimes you may wish to merge or replace the current input. Here's how:
 
 #### Replacing the entire input array with new data:
 
-	Input::merge(array('doctor' => 'Bones', 'captain' => 'Kirk'));
+	Input::replace(array('doctor' => 'Bones', 'captain' => 'Kirk'));
 
 ## Clearing Input
 
-To clear all input data for the current request, using the `clear()` method, for example:
+To clear all input data for the current request, you may use the `clear` method:
 
 	Input::clear();
\ No newline at end of file

laravel/documentation/views/html.md

@@ -85,7 +85,7 @@ For example, the < symbol should be converted to its entity representation. Conv
 
 ### Generating a link to a controller action with wildcard values:
 
-	echo HTML::link_to_action('user@profile', array($username));
+	echo HTML::link_to_action('user@profile', 'User Profile', array($username));
 
 <a name="mail-to-links"></a>
 ## Mail-To Links