adding composer.json
merge fix
adding composer.json