the composer file is at the same level as the 'modules' folder, changing that.
Merge remote-tracking branch 'origin/master'