diff --git a/.gitattributes b/.gitattributes
index 8f992822..8c58a027 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,23 @@
-/.github export-ignore
-/api export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-generate.sh export-ignore
-.gitmodules export-ignore
\ No newline at end of file
+# Line-ending normalization for text files.
+* text=auto
+
+# PHP-aware hunk headers in `git diff`.
+*.php diff=php
+
+# Manifest: each bump touches its own line — take both sides on overlap
+# instead of raising a conflict.
+/composer.json merge=union
+
+# Default: nothing is included in the `composer archive` of the package.
+# Re-include only the files consumers actually need below.
+* export-ignore
+
+# Package manifest and top-level documentation.
+/composer.json   -export-ignore
+/LICENSE         -export-ignore
+/README.md       -export-ignore
+/CHANGELOG.md    -export-ignore
+
+# Generated PHP DTOs, autoloaded through composer.json PSR-4.
+/generated       -export-ignore
+/generated/**    -export-ignore
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 13566b81..00000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 9e6fee39..00000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/roadrunner-api.iml" filepath="$PROJECT_DIR$/.idea/roadrunner-api.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
deleted file mode 100644
index c923ef61..00000000
--- a/.idea/php.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MessDetectorOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PHPCSFixerOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PHPCodeSnifferOptionsConfiguration">
-    <option name="highlightLevel" value="WARNING" />
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PhpIncludePathManager">
-    <include_path>
-      <path value="$PROJECT_DIR$/vendor/composer" />
-      <path value="$PROJECT_DIR$/vendor/google/protobuf" />
-    </include_path>
-  </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="8.1" />
-  <component name="PhpStanOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PsalmOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/roadrunner-api.iml b/.idea/roadrunner-api.iml
deleted file mode 100644
index 1f9e735b..00000000
--- a/.idea/roadrunner-api.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/generated/GPBMetadata" isTestSource="false" packagePrefix="GPBMetadata\" />
-      <sourceFolder url="file://$MODULE_DIR$/generated/RoadRunner" isTestSource="false" packagePrefix="RoadRunner\" />
-      <sourceFolder url="file://$MODULE_DIR$/generated/Temporal" isTestSource="false" packagePrefix="Temporal\" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index a0cca338..00000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/api" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/api/third_party/api" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file