Tidy up CSS after merge commit