add a canny demo
add a canny demo
fix merging conflict