add marker
added a marker
merge in the change of marker and circle