Fix Knockout missing from merge conflict
Conflicts