Added chef support
resolving conflicts