How to resolve conflict

*