latest nick data
resolved conflicts