update to 10
merge finished