Added doc and composer.json
Fixed conflicts