Handle conflict when remote updates changed local