fixed conflict

rv_voting_calc/templates/rv_voting_calc/index.html

...plates/rv_voting_calc/md_steps/found_popularity_winner.md

...ng_calc/templates/rv_voting_calc/md_steps/initial_sort.md

...oting_calc/templates/rv_voting_calc/md_steps/no_winner.md

..._calc/templates/rv_voting_calc/md_steps/removed_option.md

...ng_calc/templates/rv_voting_calc/md_steps/with_support.md

rv_voting_calc/templatetags/__init__.py

rv_voting_calc/templatetags/index.py

rv_voting_calc/tests.py

rv_voting_calc/urls.py

rv_voting_calc/views.py

rybicka/settings/base.py

rybicka/settings/production.py

rybicka/urls.py

shared/static/shared/voting.webp

shared/templates/shared/base.html

shared/templates/shared/index.html

static_src/member_group_size_calc.js

static_src/rv_voting_calc.js

static_src/shared/utils.js