Worked on the aws-amplify/amplify-cli repository to enhance migration safety and governance for DataStore Gen2. Developed a feature that detects conflict resolution scenarios during migration assessments, blocking unsupported configurations to prevent misconfigurations. The implementation involved extending the DataAssessor component with new conflict detection logic, including defensive type checks and the addition of a dedicated method for identifying conflict resolution. Updated the detection workflow and expanded test coverage to ensure reliability, while also revising documentation to guide users through the new process. Utilized TypeScript for full stack development and testing, focusing on robust feature delivery and maintainable code quality.