fixed table layout
fixed merge