update
merge
update 301 in htaccess