changed Delete to graphicon, and changed Current Conditions
resolved conflict