resolve problematic merge
added chef-tools support.
add chef-tools support