Fixes for merge conflicts with previous commit. All Branding issues.