diff --git a/app/views/aspects/_aspect_stream.haml b/app/views/aspects/_aspect_stream.haml
index 04a0c4897..b63c0b1d8 100644
--- a/app/views/aspects/_aspect_stream.haml
+++ b/app/views/aspects/_aspect_stream.haml
@@ -20,15 +20,8 @@
   = render 'aspects/no_contacts_message'
 
 #main_stream.stream{:data => {:guids => stream.aspect_ids.join(',')}}
-<<<<<<< HEAD
   - if stream.ajax_stream? 
-=======
-  - if stream.ajax_posts?
->>>>>>> added tag follow feature, mention page feature.  is now pretty easy to add new types of streams, but some more refactoring could make it even nicer
-    #pagination
-      =link_to(t('more'), next_page_path(:ajax_stream => true), :class => 'paginate')
-
   - elsif stream.posts.length > 0
     = render 'shared/stream', :posts => stream.posts
-    #pagination
-      =link_to(t('more'), next_page_path, :class => 'paginate')
+  #pagination
+    =link_to(t('more'), next_page_path(:ajax_stream => stream.ajax_stream?, :class => 'paginate')