Update date
Fix merge