History 0001-Fix-a-copy-paste-help-description-of-whatconflicts-R.patch