Browsing: conflict resolution