Fixed merge funnies