strategy updated
merge