refactor the conflict msg to chef_object behaviour

See: https://github.com/opscode/chef_objects/pull/56

/cc @seth @oferrigni