Remove *.orig file from merge