finished icon markers
merge