merge recover

merge recovery