a lot of new stuffs

Now sohva tries to save the doc, if a conflict occurred the credit is
used to retry after having solved the conflict