reject_conflict_files should optionally not care that the main file doesn't exist
Adding a conflict file at the same time the main file is deleted passes the check due to its false positive reduction strategy. These filenames are weird enough that rejecting them outright seems like a sensible option.
Cc: @brad.king