Resolve merge conflict for StructureImportSettings