restore line lost in conflict resolve