Update copyright year
merge and rebuild