remove commented code from chef_wm_data:conflict_message