fix(type.ml, parser,mly): merge If1 and If2.