Conflict resolution

If I may, below is the link to a very similar post.