added symfony composer
conflict merge