(bug 5180) Fix warning in merge view