sort table changes
sort conflict resolved