Fix a test; it wasn't fully testing that resolved conflicts are written to the database.