modified composer.json
fixed conflicts