remove tmp
merge