Some cleanups of names and checkout action NONE

If you really are checking out with action NONE, make sure the
file isn't marked for removal.  Also, rename conflict -> collision.