Change default max conflicts to 10 (fixes #2604)
Change default max conflicts to 10 (fixes #2604)

ProactiveServices/syncthing,le9i0nx/syncthing,nrm21/syncthing,jryans/syncthing,rumpelsepp/syncthing,alex2108/syncthing,norgeous/syncthing,xduugu/syncthing,kc1212/syncthing,kralo/syncthing,canton7/syncthing,ProactiveServices/syncthing,rumpelsepp/syncthing,uok/syncthing,letiemble/syncthing,letiemble/syncthing,kralo/syncthing,TheBigBear/syncthing,uok/syncthing,letiemble/syncthing,kamadak/syncthing,rumpelsepp/syncthing,jryans/syncthing,AudriusButkevicius/syncthing,Kudalufi/syncthing,plouj/syncthing,TheBigBear/syncthing,kluppy/syncthing,canton7/syncthing,AudriusButkevicius/syncthing,canton7/syncthing,wweich/syncthing,ProactiveServices/syncthing,toddleish/syncthing,imsodin/syncthing,kc1212/syncthing,xduugu/syncthing,lkwg82/syncthing,Kudalufi/syncthing,imsodin/syncthing,cherylquirion/syncthing,wweich/syncthing,cherylquirion/syncthing,syncthing/syncthing,uok/syncthing,brgmnn/syncthing,ProactiveServices/syncthing,kc1212/syncthing,jryans/syncthing,xduugu/syncthing,syncthing/syncthing,wweich/syncthing,AudriusButkevicius/syncthing,nrm21/syncthing,kluppy/syncthing,norgeous/syncthing,kamadak/syncthing,toddleish/syncthing,syncthing/syncthing,plouj/syncthing,kluppy/syncthing,le9i0nx/syncthing,imsodin/syncthing,imsodin/syncthing,lkwg82/syncthing,brgmnn/syncthing,norgeous/syncthing,uok/syncthing,alex2108/syncthing,TheBigBear/syncthing,rumpelsepp/syncthing,le9i0nx/syncthing,alex2108/syncthing,AudriusButkevicius/syncthing,jryans/syncthing,kralo/syncthing,toddleish/syncthing,nrm21/syncthing,kamadak/syncthing,alex2108/syncthing,brgmnn/syncthing,brgmnn/syncthing,kluppy/syncthing,syncthing/syncthing,cherylquirion/syncthing,kamadak/syncthing,syncthing/syncthing,plouj/syncthing,Kudalufi/syncthing,lkwg82/syncthing,toddleish/syncthing,lkwg82/syncthing,kc1212/syncthing,norgeous/syncthing,kralo/syncthing,canton7/syncthing,imsodin/syncthing,cherylquirion/syncthing,Kudalufi/syncthing,wweich/syncthing,xduugu/syncthing,plouj/syncthing,letiemble/syncthing,TheBigBear/syncthing,syncthing/syncthing,nrm21/syncthing,le9i0nx/syncthing