no need to check remote for just-created file

rationalized conflict filenames
refactoring