didn't want .orig file from merge