update fire
merge fix