Update composer
Resolve merge conflicts
Merge branch 'test'