My Thoughts on conflict resolution