Conflict resolution
I came upon this article ( do not remember how found it as an open tab when I got back from work). I plan to update this entry with what I glean from it. Actually I am hoping that some of my smart readers will read it and summarize it for me.