Add htaccess
merge