Email Record: Resolving conflict /