Worked on the chainguard-dev/terraform-provider-cosign repository to enhance conflict handling by introducing defined constants for conflict resolution strategies. Focused on code refactoring and constant definition in Go, the developer replaced string literals with REPLACE, SKIPSAME, and APPEND constants to improve code readability and reduce the risk of typos during string comparisons. This approach centralized and hardened the conflict resolution logic, ensuring more consistent behavior across merge paths and laying a foundation for safer future extensions. The work did not involve bug fixes but emphasized maintainability and robustness in the conflict resolution process, leveraging Go development best practices throughout the implementation.