Remove a .orig file left over from conflict resolution.