Add conflict resolution to the browser example