recover changes to PTFOp lost because of merge and CRLF issues