removed unused by mergeconflict resulted .orig file.