bug fix: the -R option was erased by mismerge