Removing .htaccess file from repository.
Updated theme.
Correcting branch divergence by deleting sites/default/files/.htaccess