conflict (version control)

  1. REDIRECTEdit conflict {{R from alternate name}}