diff --git a/plugins/proposals_discussion b/plugins/proposals_discussion
index 1bd718a..f9404f2 160000
--- a/plugins/proposals_discussion
+++ b/plugins/proposals_discussion
@@ -1 +1 @@
-Subproject commit 1bd718a5f8a5268ca580dded82a6c5fc5b8480dd
+Subproject commit f9404f285440386c1e740c858e8bb0da405b656d
diff --git a/public/proposal-app b/public/proposal-app
index af23f01..02d17d8 160000
--- a/public/proposal-app
+++ b/public/proposal-app
@@ -1 +1 @@
-Subproject commit af23f0110e0c6b4e38b871746128d399019dc3db
+Subproject commit 02d17d88a5b9fe2541193f9d8ea894c8627591dd
diff --git a/test/unit/api/articles_test.rb b/test/unit/api/articles_test.rb
index 4ebd78a..9f08b17 100644
--- a/test/unit/api/articles_test.rb
+++ b/test/unit/api/articles_test.rb
@@ -442,7 +442,6 @@ class ArticlesTest < ActiveSupport::TestCase
     assert_equal user.person, Article.last.last_changed_by
   end
 
-<<<<<<< HEAD
   should 'vote for an article' do
     article = fast_create(Article, :profile_id => user.person.id, :name => "Some thing")
     params[:value] = 1
--
libgit2 0.21.2