first code
merge fix