Fixed islands and merge conflicts.