Fix merge conflict which caused visual regression of byline
Merge pull request #3425 from guardian/byline-picture

Fix merge conflict which caused visual regression of byline