fixed stuffs
merge