fixes conflicts with fork

app/controllers/account_controller.rb

@@ -25,7 +25,7 @@ class AccountController < ApplicationController
       if @account.organization?
         params.require(:account).permit(:phone_number, :email_on_comment, :email_on_comment_reply, :newsletter, organization_attributes: [:name, :responsible_name])
       else
-        params.require(:account).permit(:username, :public_activity, :email_on_comment, :email_on_comment_reply, :email_on_direct_message, :email_digest, :newsletter)
+        params.require(:account).permit(:username, :public_activity, :email_on_comment, :email_on_comment_reply, :email_on_direct_message, :email_digest, :newsletter, :official_position_badge)
       end
     end
 

app/views/account/show.html.erb

@@ -87,6 +87,17 @@
             <% end %>
           </div>
 
+          <div>
+            <%= f.label :official_position_badge do %>
+              <%= f.check_box :official_position_badge,
+                               title: t('account.show.official_position_badge_label'),
+                               label: false %>
+              <span class="checkbox">
+                <%= t("account.show.official_position_badge_label") %>
+              </span>
+            <% end %>
+          </div>
+
           <%= f.submit t("account.show.save_changes_submit"), class: "button" %>
         </div>