auto resolve conflict