Primitive operator code generation done
Fixed merge conflicts