CONFLICT_GIST

Removing visual-regression-tests/mock-accounts/BASE_ACCOUNT/screenshots/baseline/protectedbrowsing_full_page_Chrome_v63_1024x654.png
Removing visual-regression-tests/mock-accounts/BASE_ACCOUNT/screenshots/baseline/help_full_page_Chrome_v63_1024x654.png
Auto-merging index.html
Auto-merging copy/en-US/dictionary.json
CONFLICT (content): Merge conflict in copy/en-US/dictionary.json
Auto-merging app/elements/si-page-troubleshoot-device/test/si-page-troubleshoot-device.html
Auto-merging app/elements/si-page-support/test/si-page-support.html
Auto-merging app/elements/si-page-support/si-page-support.js
Auto-merging app/elements/si-page-support/si-page-support.html
Auto-merging app/elements/si-page-device-entity/test/si-page-device-entity.html
CONFLICT (content): Merge conflict in app/elements/si-page-device-entity/test/si-page-device-entity.html
Auto-merging app/elements/si-manage-devices-list/test/si-manage-devices-list.html
Auto-merging app/elements/si-form-chain/test/si-form-chain.html
Auto-merging app/elements/si-form-chain/si-form-chain.js
Auto-merging app/elements/si-device-details/test/si-device-details.html
CONFLICT (content): Merge conflict in app/elements/si-device-details/test/si-device-details.html
Auto-merging app/elements/si-device-details/si-device-details.js
CONFLICT (content): Merge conflict in app/elements/si-device-details/si-device-details.js
Auto-merging app/elements/si-connected-device-list-item/test/si-connected-device-list-item.html
CONFLICT (content): Merge conflict in app/elements/si-connected-device-list-item/test/si-connected-device-list-item.html
Auto-merging app/elements/si-app/si-app.js
CONFLICT (content): Merge conflict in app/elements/si-app/si-app.js
Automatic merge failed; fix conflicts and then commit the result.