changed module from remote to local
Fixing conflicts