Merge: grammar: add union and intersection types