Merge "fix bug 41280, show correct content when displaying edit conflicts"