Allow js in .htaccess
Conflicts Resolved