entity conflict resolve idea