One more fix on conflict detection #1285

Job	Run time
Go Lint	34s
Go Unit Tests	22s
Go Integration Tests (sqlite)	1m 24s
Build (darwin/amd64)	1m 59s
Go Integration Tests (sqlcipher)	1m 32s
Python Lint	19s
Go Integration Tests (postgres)	1m 40s
Build (darwin/arm64)	1m 55s
Python Integration Tests (aim)	1m 50s
Build (linux/amd64)	1m 3s
Python Integration Tests (mlflow)	2m 21s
Build (linux/arm64)	1m 27s
Build (windows/amd64)	1m 11s
All required checks done	1s
Push to GitHub Container Registry	14s
Release	0s
	17m 52s

Provide feedback