Compare your template override files against the files listed in the change log in the distribution doc folder
Merge any that have changes