blocks
merge
fixes