commit from MI repo
merge conflict
Added composer.json