restyle full
merge