format code
merge code