markers
remove log
merge