# Resolving composer.lock merge conflicts

`composer update --lock` fixes lock file when merging branches with .lock conflicts.