Setting "files.saveConflictResolution" to "overwriteFileOnDisk" in vscode settings.json worked for me.
"files.saveConflictResolution"
"overwriteFileOnDisk"