how to resolve conflict
TM – resolve