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