updated check vsphere nagios script
fix merge conflict