Fix: remove duplicate module
Merge branch 'dev'