*Fix merge update out-of-date