Resolve Report conflict