fixed simple merge conflict
fixed simple merge conflict

sksullivan/shader-school,Heart2009/shader-school,stackgl/shader-school,sksullivan/shader-school,sksullivan/shader-school,zhakui/shader-school,Heart2009/shader-school,zhakui/shader-school,stackgl/shader-school