Updated table formatting
Fixed merge