Analytics conflicts resolved