Added Offline Connexion
Correcting merge conflict