offline mode and code merge