Resolved merge conflict.
Added a composer.json so I can load from composer.