change composer manifest
Merge origin/master