added table sort
files added
conflict fixing