knife command fix
efewfMerge remote-tracking branch 'origin/master'
changes
fixed conflict