CONFLICT (content): Merge conflict in doc/topics/autodevops/index.md
CONFLICT (content): Merge conflict in config/webpack.config.js
CONFLICT (content): Merge conflict in app/views/shared/boards/_show.html.haml
CONFLICT (content): Merge conflict in app/helpers/system_note_helper.rb