trying to fix modules
fixed merge conflict