[BUGFIX] Always return existing file, causing conflict mode to apply