Use ours merge strategy for composer.json and src/Runner/Version.php to avoid merge conflicts