Committee okays merger of National Housing Authority into NPHA