Offline mode implemented
resolve merge