[IC] manual merge