Latest json.edit removes need for css tricks; formats boolean better
resolve merge conflict