finish the joke even better
Fix the merge and finish the joke as it should be