Solve conflict

app/assets/stylesheets/pages/_contacts.scss

@@ -123,3 +123,31 @@ a:hover {
   justify-content: center;
   align-items: center;
 }
+
+
+
+
+
+.contact {
+  color: white;
+}
+
+.contacts {
+  height: 570px;
+  overflow: scroll;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

app/views/pages/index.html.erb

@@ -1,7 +1,7 @@
 <div class="container">
   <div class="contacts-container text-color">
     <div class="contacts half">
-      <h2>Contacts</h2>
+    <h2 class="contact">Contacts</h2>
       <% current_user.contacts.each do |contact| %>
         <%= render "pages/contact", contact: contact %>
       <% end %>

app/views/pages/new.html.erb

@@ -0,0 +1,10 @@
+<%= simple_form_for(@page) do |p| %>
+
+  <%= p.input :first_name, as: :text, input_html: { autocomplete: "off" } %>
+  <%= p.input :last_name, as: :text, input_html: { autocomplete: "off" } %>
+  <%= p.input :email, as: :text, input_html: { autocomplete: "off" } %>
+  <%= p.input :photo %>
+  <%= p.input :photo_cache, as: :hidden %>
+
+  <%= p.button :submit, class: "btn btn-primary" %>
+<% end %>