rm orig file
resolved some error caused by resolving conflict