first edit this branch

app/views/users/shared/_links.html.erb

 <%- if controller_name != "sessions" %>
+<<<<<<< HEAD
   <%= link_to "Log in", new_session_path(resource_name) %><br/>
 <% end %>
 
@@ -8,6 +9,17 @@
 
 <%- if devise_mapping.recoverable? && controller_name != "passwords" && controller_name != "registrations" %>
   <%= link_to "Forgot your password?", new_password_path(resource_name) %><br/>
+=======
+  <%= link_to "Log in", new_session_path(resource_name) %><br />
+<% end %>
+
+<%- if devise_mapping.registerable? && controller_name != "registrations" %>
+  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+<% end %>
+
+<%- if devise_mapping.recoverable? && controller_name != "passwords" && controller_name != "registrations" %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+>>>>>>> first edit this branch
 <% end %>
 
 <%- if devise_mapping.confirmable? && controller_name != "confirmations" %>