Just on point A. You can configure the maximum number of conflicts allowed for each folder.

I was running into conflicts with obsidian notes. Reduced the max conflicts on those folder to zero, problem gone.

It’s in the folder specific advanced settings.