Fix bustage of merge conflicts by bug 842961