diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 340b4f2e..00a245fe 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -49,8 +49,7 @@
                             <div class="col-md-6 col-md-offset-4">
                                 <button type="submit" class="btn btn-primary">Login</button>
 
-<<<<<<< HEAD
-                                <a class="btn btn-link" href="/password/email">Forgot Your Password?</a>
+                                <a class="btn btn-link" href="{{ url('/password/email') }}">Forgot Your Password?</a>
                             </div>
                         </div>
                     </form>
@@ -58,15 +57,5 @@
             </div>
         </div>
     </div>
-=======
-								<a class="btn btn-link" href="{{ url('/password/email') }}">Forgot Your Password?</a>
-							</div>
-						</div>
-					</form>
-				</div>
-			</div>
-		</div>
-	</div>
->>>>>>> master
 </div>
 @endsection