Skip unnecessary attempts when resolving conflicts
Merge pull request #2303 from rykov/master

Optimize conflict resolution to prevent "infinite loop" effect
changelog fixup

[ci skip]
there's a bug in RG 2 rc1, so skip