Fix merge conflict

.gitlab-ci.yml

README.md

config.rb

data/applications.yml

data/events.yml

data/features.yml

data/jobs.yml

data/team.yml

generators/direction.rb

source/about/index.html.md

source/community/sponsorship/index.html.markdown

source/comparison/gitlab-ce-ee-vs-bitbucket-server.html.haml

source/comparison/gitlab-ce-ee-vs-saas.html.haml

source/comparison/gitlab-com-vs-bitbucket-org.html.haml

source/comparison/gitlab-ee-vs-github-enterprise.html.haml

source/comparison/gitlab-issueboards-vs-asana.html.haml

source/comparison/gitlab-issueboards-vs-trello.html.haml

...son/gitlab-merge-request-vs-github-pull-request.html.haml

source/comparison/gitlab-pages-vs-github-pages.html.haml

source/comparison/gitlab-self-hosted-vs-github.html.haml