Minor format changes

Swapped silver for gradient on on-boarding page.
Added a conflict prompt to Results page.
Merge branch 'onboarding-3' into gh-pages