add code circle
add code shelf rectang
fixed bug pull rebase