try to fix merge conflicts

CONTRIBUTING.md

README.md

android/app/src/main/assets/fonts/drip-home-icon-font.ttf

android/app/src/main/assets/fonts/drip-home-icons.ttf

assets/drip-home-icons.js

assets/drip-icons.js

assets/fonts/config-drip-home-icons.json

assets/fonts/config-drip-icon-font.json

assets/fonts/drip-home-icons.ttf

assets/home-circle.js

assets/home-drop.js

components/chart/chart.js

components/cycle-day/cycle-day-overview.js

components/cycle-day/symptoms/action-button-footer.js

components/header/cycle-day.js

components/header/symptom-view.js

components/home.js

components/settings/index.js

components/settings/password/create.js

components/settings/password/password-field.js