error not showing another text, fix
retry btn added
another fix
fix conflicts