Integrate general recovery in discolog
General recovery task
try to solve merge problems