(bug 5180) Fix warning in merge view
Merge pull request #490 from anall/feature/bug5180

(bug 5180) Fix warning in merge view