level editable table completed
conflict resolved