merge conflict in Bug #859555