Fix merge conflict which caused visual regression of byline

Don't quite know how this one slipped through...

### before
![screenshot from 2014-03-06 12 09 20](https://f.cloud.github.com/assets/80089/2344831/e17e95e2-a529-11e3-97b3-c66670871dcd.png)

### after
![screenshot from 2014-03-06 12 08 54](https://f.cloud.github.com/assets/80089/2344834/e6aaba6e-a529-11e3-823a-bd520a18c8e4.png)