fixed merge bug and removed module structure