Added tabular submodule
Fixed merge issue