fixed conflicts in ZestStructuredExpression.java

Conflicts:
	src/org/mozilla/zest/core/v1/ZestStructuredExpression.java