browser: simplify getConflicts
browser: simplify getConflicts

Remove the ability to resolve while iterating since this probably
won't be used in practice. Paves the way for getConflict and
resolveConflict.

Netsend/PerspectiveDB,Netsend/persdb,Netsend/PerspectiveDB,Netsend/PerspectiveDB,Netsend/persdb,Netsend/persdb