htaccess tweak
Fixing conflicts.