section blocks
fixed some conflicts