fix merge conflict
merge update to give widths to .container instead of max-width
Merge branch 'master' into 3.0.3-wellnessfx
Merge branch 'master' into 3.0.3-wellnessfx
remove mess from conflict markup