updated composer lock file
merge conflicts