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

(cherry picked from commit 933c2d2e1a04185d5fca92d1fc7107130920a331)