Use cl-flet, not flet
Add some ediff faces