I love the idea of conflict that makes you laugh, too. I want to laugh when I'm reading novels and writing conflict can give you an opportunity for that, a comedy of errors sort of thing.
So, have fun with your conflict! I know I am!
Happy Writing, Happy Reading!