fix merge conflicts

Author: rasbt

faq/regularized-logistic-regression-performance.md

@@ -12,7 +12,9 @@ We know that our goal in an unregularized model is to minimize the cost function
 
 ![](./regularized-logistic-regression-performance/unregularized.png)
 
-Now, if we regularize the cost function (e.g., via L2 regularization), we add an additional to our cost function (J) that increases with the value of your parameter weights (w). Regularization strength is controlled via the addition of a new hyperparameter, lambda.
+
+Now, if we regularize the cost function (e.g., via L2 regularization), we add an additional term to our cost function (J) that increases as the value of your parameter weights (w) increase; keep in mind that the regularization we add a new hyperparameter, lambda, to control the regularization strength.
+
 
 ![](./regularized-logistic-regression-performance/l2-term.png)