Email Record: Interactive conflict resolution /