[IC] merged conflict