.htaccess edits on the server
merged .htaccess