add js rect and line
merge