[IMP]resolve conflict