Added https fallback for failed websites
Fix conflict