Refactoring: introduced conflict map for islands