wip
merge conflict
fix inExpr in localDecl
remove duplicate code in assignment
fix in expr in bare context