ENH: organize - show files with conflicts requiring adding _obj-

ENH: organize - show files with conflicts requiring adding _obj- #823