Updated .htaccess
Updated .htaccess for merge conflict