merge getSquare versions