Solving conflicts in composer.lock