bunch of changes
commit before merge
merge
fixing digests