I'm trying to merge my changes to deploy and commit my application, and this error that says "Merging: Conflicts detected while merging, Please resolve conflicts to conclude the merge." I press "Show file conflicts" and it shows me a file called vendorlib-sbom.json is the conflict. I go into the folder and see that it appears in the file explorer. If I delete this file, will the conflict be technically solved? I don't want to delete something important on accident.