(#3096) - clarify conflict resolution in docs

I realize I was not giving the correct information here. Also, I was using the word "simply" way too much.