[db] Fix merge conflicts that snuck in somehow