Resolving composer merge conflicts | Theodo — Explains strategy for working through merge conflicts in composer.lock