Browsing: global conflict resolution