Correcting up cut/paste mistakes made in manual conflict resolution.