diff --git a/app/views/forem/posts/_post.html.erb b/app/views/forem/posts/_post.html.erb
index 0227f8d7b..ad8459b9e 100644
--- a/app/views/forem/posts/_post.html.erb
+++ b/app/views/forem/posts/_post.html.erb
@@ -32,11 +32,7 @@ show_buttons = post.persisted? && local_assigns[:show_buttons].nil? ? true : sho
           <% if post_user.is_a?(Forem::NilUser) %>
             <%= t(:deleted) %>
           <% else %>
-<<<<<<< HEAD
-            <%= link_to_if Forem.user_profile_links, post_user, [main_app, post_user] %>
-=======
-            <%= link_to_if Forem.user_profile_links, post.user.forem_name, [main_app, post.user] %>
->>>>>>> dc8f34302e1d1b02f68629b436e0fbfc7754f788
+            <%= link_to_if Forem.user_profile_links, post_user.forem_name, [main_app, post_user] %>
           <% end %>
         </div>
         <div class='icon'><%= forem_avatar(post_user, :size => 60) %></div>
diff --git a/lib/forem/engine.rb b/lib/forem/engine.rb
index 8ffabe748..a88d10020 100644
--- a/lib/forem/engine.rb
+++ b/lib/forem/engine.rb
@@ -1,3 +1,5 @@
+require 'emoji'
+
 module ::Forem
   class Engine < Rails::Engine
     isolate_namespace Forem
@@ -13,17 +15,19 @@ def root
       Decorators.register! Engine.root, Rails.root
     end
 
+    config.assets.paths << Emoji.images_path
+
     # Precompile any assets included straight in certain pges
     initializer "forem.assets.precompile", :group => :all do |app|
       app.config.assets.precompile += %w[
         forem/admin/members.js
       ]
+      app.config.assets.precompile << "emoji/**/*.png"
     end
   end
 end
 
 require 'simple_form'
-require 'emoji'
 require 'select2-rails'
 
 # We need one of the two pagination engines loaded by this point.