fix merge problem
Merge pull request #4387 from guardian/facia-front-container-override

fix merge problem