Merging from server after restoring the droplet to its original state