Resolving composer merge conflicts | TheodoExplains strategy for working through merge conflicts in composer.lock