anchor.diff:  <div class="clearfix mxn2">
     <div class="sm-col sm-col-8 px2">
   
  -    <% product_membership = current_user.team_memberships.find_by(product: @product) %>
  +    <% if signed_in? %>
  +      <% product_membership = current_user.team_memberships.find_by(product: @product) %>
   
  -    <% if product_membership.nil? || product_membership.bio.nil? %>
  +      <% if product_membership.nil? || product_membership.bio.nil? %>
   
  +<<<<<<< HEAD
         <div class="bg-white p3 rounded shadow mb3">
           <div class="clearfix">
             <h6 class="mt0 mb2">Hey there, <%= current_user.username %>!</h6>
             <div class="right"></div>
           </div>
           <p>Ready to pitch in on <%= @product.name %>? Introduce yourself.</p>
  +=======
  +        <div class="bg-white p3 rounded shadow mb3">
  +          <div class="clearfix">
  +            <h6 class="mt0 mb2">G'day <%= current_user.username %>!</h6>
  +            <div class="right"></div>
  +          </div>
  +          <p>Ready to pitch in on <%= @product.name %>? Introduce yourself.</p>
  +>>>>>>> Only show intro box to signed in users.
   
  -        <form role="form" method="post" action="<%= product_person_path(@product, current_user) %>">
  -          <input name="authenticity_token" value="<%= form_authenticity_token %>" type="hidden">
  -          <input name="_method" value="patch" type="hidden">
  +          <form role="form" method="post" action="<%= product_person_path(@product, current_user) %>">
  +            <input name="authenticity_token" value="<%= form_authenticity_token %>" type="hidden">
  +            <input name="_method" value="patch" type="hidden">
   
  -          <textarea class="form-control mb2" name="membership[bio]" rows="2" placeholder="What do you like to do? What is your favorite sandwich?"></textarea>
  +            <textarea class="form-control mb2" name="membership[bio]" rows="2" placeholder="What do you like to do? What is your favorite sandwich?"></textarea>
   
  -          <button type="submit" class="btn btn-primary btn-block">Introduce yourself!</button>
  -        </form>
  -      </div>
  +            <button type="submit" class="btn btn-primary btn-block">Introduce yourself!</button>
  +          </form>
  +        </div>
  +      <% end %>
       <% end %>
   
       <%= react_component 'NewsFeedList', items: ActiveModel::ArraySerializer.new(
  
positive.code: 
    <div class="sm-col sm-col-4 px2">
  
      <div class="bg-gray-5 p2 rounded">
        <h6 class="mt0 py2 mb0 black">The Big Idea</h6>
        <%= react_component 'Markdown', content: @product.lead, normalized: true %>
        <a class="block mb3" href="#">Read more</a>
  
        <div class="stat-group mb0">
          <div class="stat">
  
negative.code:         </div>
        </div>
      </div>
  
      <% if can?(:edit, @product) %>
        <div class="mb2">
          <a class="btn btn-default btn-block" href="<%= edit_product_path(@product) %>">Edit product</a>
        </div>
      <% end %>
  
      <% if @product_marks.count > 0 %>
        <h6 class="mt0 py2 mb0 gray-dark">Product Tags</h6>
  