resolve conflict
s