do not keep backup after doing git merge with conflicts