I solve this by Syncthing running on all clients. Very rarely do I ever have a problem with conflicts. Only if I add a new pass while my phone is offline and then make another edit on my computer would there be an issue. I think it only happened once, and that was because I did it on purpose to see what happened.
Turns out syncthing creates a .conflict file and then I tell keepassxc to do a merge on the two files and then we are back to normal.
(side note) And the folding phone will be a "Apple First".
I wonder if they still still have a stupid camera notch on the device. They is no point (to me) have a thin phone even you end up having a 5mm notch the size of your phone