fixed composer.json
solved conflicts