Resolving composer.lock merge conflicts

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

Created 2021-04-08 08:57:07 UTC by Sander
Updated 2021-04-08 08:57:28 UTC by Sander