fold in the recent changes files