Browsing: mediation and conflict resolution