BZ-1049361 - Conflict pop-up upon saving reappearing after conflict was resolved

(cherry picked from commit 2f6baae3c32d3786d20e973b655bfe56b85664cf)