funny
&funny
conflict fixed