片付ける

(1) to tidy up/to put in order/to straighten up/to put away/ (2) to settle (problem) /to clear (dispute) / (3) to finish/to bring something to an end/ (4) to marry off / (5) to do away with someone/to bump someone off

整頓

orderliness/put in order/tidying up/arranging neatly