shading + space bar
fixed merge