added blocks
merged files