Browsing: conflict management