fixing deletions and other conflict problems