renew design
merge