Switch to composer version of tools
Merge with master