knockout and some style
merge conflict