GONRG-4937: relosve conflicts

5 jobs for GONRG-4937-bug-db-linters in 1 minute and 51 seconds (queued for 2 seconds)