assertions added to all files
merge