updated typechecker
updated typechecker + merge
updated typechecker + post-merge