add to README how to proceed with git config merge.ours.driver true