fix dependency(hack)
merge