backup merge in git