Fixed .htaccess conflict