icons merge fix