edit icon
removed conflict