square up

make square; "Square the circle"; "square the wood with a file"

even up the edges of a stack of paper, in printing

settle conclusively; come to terms; "We finally settled the argument"