added .orig extension for unresolved merges