remove conflict .orig file
remove conflict .orig file

py-xiaoran/web,Kjwon15/earthreader-web,earthreader/web,earthreader/web,py-xiaoran/web,earthreader/web,Kjwon15/earthreader-web,Kjwon15/earthreader-web,py-xiaoran/web