fold in the changes files so far