ttable.h indentiated
conflict resolved