audit: check conflict names
postgresql: fix conflict

Closes #16873.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>