After consideration, I decided to only allow risking Conviction on rolls unrelated to Edges in rare circumstances.  My notes about Conviction have been edited to match, with strikeouts so that people can see where the changes are.