slave finshed tags
removed errors
merge
merge