Fix Knockout missing from merge conflict