fixed run chef client command
fixed typo
fixing merge conflicts