basic merge working, missing struct generation