format code and merge