Rename conflict to collision to prevent confusion
Fix checkout NONE to not remove file

If you are checking out NONE, then don't remove.