finish circle class
merge