add my name into the first stupid tip
Merge branch 'no-ff-yo'