log messages in FileSystemDriver
resolving conflict
resolving conflict