composer and packages updated
merging