don't keep .orig files around after successful merges