changed for update very day not every 15min
resolve conflict