finally resolve conflict