Started working on tree merging for concrete syntax
Further work on merging actual syntax