merge knockout.demo