alternate style merge

https://www.pivotaltracker.com/story/show/70476264