fix numbers
merge