Fixed merge issue duping potion effects