All files ending with .orig comes from a merge. They all should be removed