Update/merge our changes to last files.