my changes
add simple blocks
merging
Merge remote-tracking branch 'origin/master'