Add Module Conflict Resolution Support
Remove Unused Imports