anchor.diff:  		    </div>
   	    </div> 	
   	<% end %>
  -</div>	
  +</div>	
positive.code: <<<<<<< HEAD
  
  <div class="page-header header-filter fill">
  	<% if not user_signed_in? %>
  		<div class="row">
  
negative.code: 				</div>
  			</div>
  		</div>	
  
  	<% else %>
  		<div class="row">
  