fixed add module
fixed merge