[client] Add log messages when producing conflict files. Rename the local version to conflict file.