Remove .orig spam from an earlier merge