Fix local conflict resolution in browser example