city shader
merge
fix