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