fix merge conflicts

CONTRIBUTING.md

_data/merchants.yml

_data/team.yml

...7-09-logs-for-the-Kovri-dev-meeting-held-on-2017-07-09.md

...erview-and-logs-for-the-dev-meeting-held-on-2017-07-09.md

...7-16-logs-for-the-Community-meeting-held-on-2017-07-16.md

...7-23-logs-for-the-Kovri-dev-meeting-held-on-2017-07-23.md

...erview-and-logs-for-the-dev-meeting-held-on-2017-07-23.md

...7-30-logs-for-the-Community-meeting-held-on-2017-07-30.md

...8-06-logs-for-the-Kovri-dev-meeting-held-on-2017-08-06.md

...erview-and-logs-for-the-dev-meeting-held-on-2017-08-06.md

...8-13-logs-for-the-Community-meeting-held-on-2017-08-13.md

_strings_en.yml

community/hangouts/index.md

css/custom.css

get-started/faq/index.md

resources/moneropedia/smartmining.md

resources/moneropedia/tail-emission.md

resources/people.md

resources/user-guides/index.md