merged add and edit joke