remove magical number
merge