Fix errors, add max-width to beautify string

_locales/en/messages.json

@@ -1773,17 +1773,11 @@
 	"ghostery_dawn_onboarding_welcome": {
 		"message": "Welcome to Ghostery Dawn!"
 	},
-<<<<<<< Updated upstream
 	"ghostery_dawn_onboarding_lets_begin": {
-=======
-<<<<<<< Updated upstream
-	"ghostery_browser_hub_onboarding_lets_begin": {
->>>>>>> Stashed changes
 		"message": "We've centralized online privacy by integrating our signature as well as novel technologies."
-=======
+	},
 	"ghostery_dawn_onboarding_welcome_message": {
 		"message": "Our browser protects your data and blocks bloatware so that you can surf privately and over 2x faster than with Chrome."
->>>>>>> Stashed changes
 	},
 	"ghostery_dawn_onboarding_lets_do_this": {
 		"message": "Set up My Browser"

app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.jsx

@@ -26,18 +26,8 @@ const WelcomeView = (props) => {
 	const { setSetupStep } = actions;
 	return (
 		<div className="WelcomeView__container">
-<<<<<<< Updated upstream
-			<div className="WelcomeView__title">{t('ghostery_dawn_onboarding_welcome')}</div>
-			<div className="WelcomeView__subtitle">{t('ghostery_dawn_onboarding_lets_begin')}</div>
-=======
-<<<<<<< Updated upstream
-			<div className="WelcomeView__title">{t('ghostery_browser_hub_onboarding_welcome')}</div>
-			<div className="WelcomeView__subtitle">{t('ghostery_browser_hub_onboarding_lets_begin')}</div>
-=======
 			<div className="WelcomeView__title">{t('ghostery_dawn_onboarding_welcome')}</div>
 			<div className="WelcomeView__subtitle">{t('ghostery_dawn_onboarding_welcome_message')}</div>
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 			<img className="WelcomeView__rocketShip" src="/app/images/hub/welcome/rocketShip.png" />
 			<NavLink className="WelcomeView__ctaButton" to="/onboarding/1" onClick={() => setSetupStep({ setup_step: LOGIN, origin: WELCOME })}>
 				<span>{t('ghostery_dawn_onboarding_lets_do_this')}</span>

app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.scss

@@ -28,7 +28,7 @@
 
 .WelcomeView__subtitle {
 	margin-bottom: 20px;
-	width: 392px;
+	max-width: 495px;
 	font-size: 18px;
 	line-height: 2.33;
 	text-align: center;