* fix merge problem

* fix merge problem

* more cleanup

* more cleanup

* improve CheckExpressions

* format

* fix build

* remove ModuleOrNamespaceExprWithSig and put it in CheckedImplFile

* format

* cleanup the cleanup